[Releng] [Photon] Delete old Dev framework and add a new Toolsmiths one

- Delete the old Dev releng profile and replace it with a Toolsmith one
- Add new features: Junit, Releng, Diagramgen and Debug to be released
- Move the junit framework at the root of the junit test folder
- Remove Toolsmiths from the main build as it will have its own
- Repopulate the SDK feature and distribute the excess features in theit own root parent
- Add a new views feature
- Moved the assistants to the toolsmiths folder and put them in the toolsmiths build

Change-Id: I1c0331b25607baaf1cfcc635d9c7b0d9c6d73e63
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>

712 files changed, 51 insertions, 86 deletions

diff --git a/plugins/developer/pom.xml b/plugins/developer/pom.xml
deleted file mode 100644
index c2b18521919..00000000000
--- a/plugins/developer/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.dev.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>3.0.0-SNAPSHOT</version>
-		<relativePath>../../releng/dev/pom.xml</relativePath>
-	</parent>
-	<artifactId>org.eclipse.papyrus.developer</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>0.0.1-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>Papyrus Developer Tools</name>
-	<description>Optional tools for Papyrus developers providing aids for debugging, releng, and other development tasks.</description>
-
-	<modules>
-		<module>org.eclipse.papyrus.codegen</module>
-		<module>org.eclipse.papyrus.def</module>
-		<module>org.eclipse.papyrus.dev.assistants.codegen</module>
-		<module>org.eclipse.papyrus.dev.pluginexplorer</module>
-		<module>org.eclipse.papyrus.dev.project.management</module>
-		<module>org.eclipse.papyrus.dev.types</module>
-		<module>org.eclipse.papyrus.dev.ui</module>
-		<module>org.eclipse.papyrus.dev.view.services.edit.request</module>
-		<module>org.eclipse.papyrus.gmf.editpartview</module>
-		<module>org.eclipse.papyrus.gmf.editpoliciesstates</module>
-		<module>org.eclipse.papyrus.gmf.figureview</module>
-		<module>org.eclipse.papyrus.gmfgenextension</module>
-		<module>org.eclipse.papyrus.infra.emf.commandstack</module>
-		<module>org.eclipse.papyrus.infra.gmfdiag.css.debug</module>
-		<module>org.eclipse.papyrus.mwe2.utils</module>
-		<module>org.eclipse.papyrus.releng.tools</module>
-		<module>org.eclipse.papyrus.uml.m2m.qvto.tests.tools</module>
-	</modules>	
-</project>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 576e1af1d9a..0615e957b29 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -22,6 +22,5 @@
 		<module>uml</module>
 		<module>doc</module>
 		<module>sdk</module>
-		<module>toolsmiths</module>
 	</modules>
 </project>
diff --git a/plugins/sdk/pom.xml b/plugins/sdk/pom.xml
index 78c6d21f067..6d77171bea6 100644
--- a/plugins/sdk/pom.xml
+++ b/plugins/sdk/pom.xml
@@ -9,7 +9,7 @@
 	    <version>0.0.1-SNAPSHOT</version>
     </parent>
 	<name>Papyrus SDK</name>
-	<description>Container of bundles specified to the SDK assembly of Papyrus.</description>
+	<description>Branding bundles for the SDK assembly of Papyrus.</description>
 
 	<modules>
 		<module>org.eclipse.papyrus.sdk</module>
diff --git a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/.classpath b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.classpath
index 098194ca4b7..098194ca4b7 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/.classpath
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.classpath
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.project b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.project
index 402fb715dfb..402fb715dfb 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.project
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.project
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c4..f08be2b06c4 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.pde.api.tools.prefs
index b2260f87129..b2260f87129 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF
index d5c26c445e8..d5c26c445e8 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/about.html b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/about.html
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/about.html
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/build.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/build.properties
index 7552a66104b..7552a66104b 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/build.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/build.properties
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.properties
index 81e288c39e8..81e288c39e8 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.properties
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.xml b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.xml
index 958c626bc31..958c626bc31 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.xml
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.xml
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/pom.xml b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/pom.xml
index 5759f5979d0..5759f5979d0 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/pom.xml
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/pom.xml
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/src/org/eclipse/papyrus/uml/profile/assistants/generator/ui/internal/Activator.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/src/org/eclipse/papyrus/uml/profile/assistants/generator/ui/internal/Activator.java
index 4ea98430d14..4ea98430d14 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/src/org/eclipse/papyrus/uml/profile/assistants/generator/ui/internal/Activator.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/src/org/eclipse/papyrus/uml/profile/assistants/generator/ui/internal/Activator.java
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/src/org/eclipse/papyrus/uml/profile/assistants/generator/ui/internal/handlers/GenerateModelingAssistantsHandler.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/src/org/eclipse/papyrus/uml/profile/assistants/generator/ui/internal/handlers/GenerateModelingAssistantsHandler.java
index 642aeba4815..642aeba4815 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/src/org/eclipse/papyrus/uml/profile/assistants/generator/ui/internal/handlers/GenerateModelingAssistantsHandler.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/src/org/eclipse/papyrus/uml/profile/assistants/generator/ui/internal/handlers/GenerateModelingAssistantsHandler.java
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/src/org/eclipse/papyrus/uml/profile/assistants/generator/ui/internal/wizards/GenerateAssistantsWizard.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/src/org/eclipse/papyrus/uml/profile/assistants/generator/ui/internal/wizards/GenerateAssistantsWizard.java
index e39d08a2a41..e39d08a2a41 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/src/org/eclipse/papyrus/uml/profile/assistants/generator/ui/internal/wizards/GenerateAssistantsWizard.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/src/org/eclipse/papyrus/uml/profile/assistants/generator/ui/internal/wizards/GenerateAssistantsWizard.java
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.classpath b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.classpath
index 3e8bd41bf6b..3e8bd41bf6b 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.classpath
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.classpath
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.project b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.project
index 89f4c610bf8..89f4c610bf8 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.project
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.project
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c4..f08be2b06c4 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.pde.api.tools.prefs
index b2260f87129..b2260f87129 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF
index 04c04ea615a..04c04ea615a 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/about.html b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/about.html
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/about.html
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/build.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/build.properties
index 5cfa9579cf0..5cfa9579cf0 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/build.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/build.properties
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/plugin.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/plugin.properties
index 302ef30eb63..302ef30eb63 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/plugin.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/plugin.properties
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/pom.xml b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/pom.xml
index 769f8c100a2..769f8c100a2 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/pom.xml
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/pom.xml
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ConnectionAssistantRule.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ConnectionAssistantRule.xtend
index 7ebc4421897..7ebc4421897 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ConnectionAssistantRule.xtend
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ConnectionAssistantRule.xtend
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/FiltersUtil.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/FiltersUtil.xtend
index 3a08459ab4f..3a08459ab4f 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/FiltersUtil.xtend
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/FiltersUtil.xtend
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/GeneratorModule.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/GeneratorModule.java
index 8720b304b18..8720b304b18 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/GeneratorModule.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/GeneratorModule.java
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantProviderRule.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantProviderRule.xtend
index 20a0a3a8eed..20a0a3a8eed 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantProviderRule.xtend
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantProviderRule.xtend
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantsGenerator.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantsGenerator.java
index bdd9b6bba57..bdd9b6bba57 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantsGenerator.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantsGenerator.java
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/PopupAssistantRule.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/PopupAssistantRule.xtend
index 76e34290c06..76e34290c06 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/PopupAssistantRule.xtend
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/PopupAssistantRule.xtend
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/internal/Activator.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/internal/Activator.java
index b8e63f3bb83..b8e63f3bb83 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/internal/Activator.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/internal/Activator.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/xtend-gen/.gitignore b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/xtend-gen/.gitignore
index ee1d87867e7..ee1d87867e7 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/xtend-gen/.gitignore
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/xtend-gen/.gitignore
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.classpath b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.classpath
index 098194ca4b7..098194ca4b7 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.classpath
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.classpath
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.project b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.project
index d0480d0dd27..d0480d0dd27 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.project
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.project
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c4..f08be2b06c4 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.pde.api.tools.prefs
index b2260f87129..b2260f87129 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/META-INF/MANIFEST.MF b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/META-INF/MANIFEST.MF
index d748e85abe6..d748e85abe6 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/META-INF/MANIFEST.MF
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/about.html b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/about.html
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/about.html
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/build.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/build.properties
index 2b63999577f..2b63999577f 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/build.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/build.properties
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.properties
index 0c882011c99..0c882011c99 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.properties
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.xml b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.xml
index b996bf535e8..b996bf535e8 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.xml
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.xml
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/pom.xml b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/pom.xml
index 3609d637390..08aa9de4c27 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/pom.xml
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-newchild</artifactId>
+	    <artifactId>org.eclipse.papyrus.uml-assistants</artifactId>
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui</artifactId>
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/src/org/eclipse/papyrus/uml/profile/newchildmenu/generator/ui/Activator.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/src/org/eclipse/papyrus/uml/profile/newchildmenu/generator/ui/Activator.java
index bbe886e0bd1..bbe886e0bd1 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/src/org/eclipse/papyrus/uml/profile/newchildmenu/generator/ui/Activator.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/src/org/eclipse/papyrus/uml/profile/newchildmenu/generator/ui/Activator.java
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/src/org/eclipse/papyrus/uml/profile/newchildmenu/generator/ui/handlers/GenerateNewChildMenuHandler.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/src/org/eclipse/papyrus/uml/profile/newchildmenu/generator/ui/handlers/GenerateNewChildMenuHandler.java
index 4d37073f0e9..4d37073f0e9 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/src/org/eclipse/papyrus/uml/profile/newchildmenu/generator/ui/handlers/GenerateNewChildMenuHandler.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/src/org/eclipse/papyrus/uml/profile/newchildmenu/generator/ui/handlers/GenerateNewChildMenuHandler.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/.classpath b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.classpath
index 248b4c5dc7a..248b4c5dc7a 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/.classpath
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.classpath
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.project b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.project
index 9f0116a015b..9f0116a015b 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.project
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.project
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c4..f08be2b06c4 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.pde.api.tools.prefs
index b2260f87129..b2260f87129 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF
index 76dc8a4e79d..76dc8a4e79d 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/about.html b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/about.html
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/about.html
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/build.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/build.properties
index c323e70e81a..c323e70e81a 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/build.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/build.properties
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/plugin.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/plugin.properties
index 0c697f102e3..0c697f102e3 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/plugin.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/plugin.properties
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/pom.xml b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/pom.xml
index 1399d19498a..3dc9bd87891 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/pom.xml
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-newchild</artifactId>
+	    <artifactId>org.eclipse.papyrus.uml-assistants</artifactId>
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.profile.newchildmenu.generator</artifactId>
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/src/org/eclipse/papyrus/uml/profile/newchildmenu/generator/Activator.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/src/org/eclipse/papyrus/uml/profile/newchildmenu/generator/Activator.java
index 2ad8af66c07..2ad8af66c07 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/src/org/eclipse/papyrus/uml/profile/newchildmenu/generator/Activator.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/src/org/eclipse/papyrus/uml/profile/newchildmenu/generator/Activator.java
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/src/org/eclipse/papyrus/uml/profile/newchildmenu/generator/NewChildMenuGenerator.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/src/org/eclipse/papyrus/uml/profile/newchildmenu/generator/NewChildMenuGenerator.xtend
index 4a0717793fd..4a0717793fd 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/src/org/eclipse/papyrus/uml/profile/newchildmenu/generator/NewChildMenuGenerator.xtend
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/src/org/eclipse/papyrus/uml/profile/newchildmenu/generator/NewChildMenuGenerator.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/xtend-gen/.gitignore b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/xtend-gen/.gitignore
index d6b7ef32c84..d6b7ef32c84 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/xtend-gen/.gitignore
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/xtend-gen/.gitignore
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/xtend-gen/org/eclipse/papyrus/uml/profile/newchildmenu/generator/.gitignore b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/xtend-gen/org/eclipse/papyrus/uml/profile/newchildmenu/generator/.gitignore
index 816cdc9b7d6..816cdc9b7d6 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/xtend-gen/org/eclipse/papyrus/uml/profile/newchildmenu/generator/.gitignore
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/xtend-gen/org/eclipse/papyrus/uml/profile/newchildmenu/generator/.gitignore
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.classpath b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.classpath
index 098194ca4b7..098194ca4b7 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.classpath
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.classpath
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.project b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.project
index e06fb1b0528..e06fb1b0528 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.project
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.project
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c4..f08be2b06c4 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.pde.api.tools.prefs
index b2260f87129..b2260f87129 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF
index 2f19c9d4c2b..2f19c9d4c2b 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/about.html b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/about.html
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/about.html
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/build.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/build.properties
index 31c15b846e8..31c15b846e8 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/build.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/build.properties
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/icons/full/obj16/plugin.gif b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/icons/full/obj16/plugin.gif
index 8493df40dfe..8493df40dfe 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/icons/full/obj16/plugin.gif
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/icons/full/obj16/plugin.gif
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/icons/full/obj16/project.png b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/icons/full/obj16/project.png
index 154776ea14e..154776ea14e 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/icons/full/obj16/project.png
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/icons/full/obj16/project.png
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.properties
index 3ff1edb84b8..3ff1edb84b8 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.properties
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.xml b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.xml
index 9953366b8ba..9953366b8ba 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.xml
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.xml
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/pom.xml b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/pom.xml
index 64692d12529..64692d12529 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/pom.xml
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/pom.xml
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/Activator.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/Activator.java
index 79fa26470e0..79fa26470e0 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/Activator.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/Activator.java
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/handlers/GenerateElementTypesHandler.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/handlers/GenerateElementTypesHandler.java
index 639b7dcb2a4..639b7dcb2a4 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/handlers/GenerateElementTypesHandler.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/handlers/GenerateElementTypesHandler.java
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/BaseElementTypeSetBlock.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/BaseElementTypeSetBlock.java
index e0b2f8e1d9d..e0b2f8e1d9d 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/BaseElementTypeSetBlock.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/BaseElementTypeSetBlock.java
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorMainPage.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorMainPage.java
index 25b18ab5871..25b18ab5871 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorMainPage.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorMainPage.java
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorParametersBlock.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorParametersBlock.java
index 212a61dda0c..212a61dda0c 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorParametersBlock.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorParametersBlock.java
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorWizard.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorWizard.java
index 887e4f40865..887e4f40865 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorWizard.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorWizard.java
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorWizardModel.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorWizardModel.java
index 76ab27a1ee9..76ab27a1ee9 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorWizardModel.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorWizardModel.java
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/IGeneratorWizardPage.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/IGeneratorWizardPage.java
index c7be545b3e2..c7be545b3e2 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/IGeneratorWizardPage.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/IGeneratorWizardPage.java
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.classpath b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.classpath
index 3e8bd41bf6b..3e8bd41bf6b 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.classpath
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.classpath
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.project b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.project
index c8b763bd773..c8b763bd773 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.project
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.project
diff --git a/plugins/developer/org.eclipse.papyrus.dev.ui/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.ui/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c4..f08be2b06c4 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.pde.api.tools.prefs
index b2260f87129..b2260f87129 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.xtend.core.Xtend.prefs
index 110a6e417d3..110a6e417d3 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.xtend.core.Xtend.prefs
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.xtend.core.Xtend.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/META-INF/MANIFEST.MF b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/META-INF/MANIFEST.MF
index 6b6956769b4..6b6956769b4 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/META-INF/MANIFEST.MF
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/about.html b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/about.html
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/about.html
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/build.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/build.properties
index 5cfa9579cf0..5cfa9579cf0 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/build.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/build.properties
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/plugin.properties b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/plugin.properties
index a65abd84a2e..a65abd84a2e 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/plugin.properties
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/plugin.properties
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/pom.xml b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/pom.xml
index 230442e40f5..230442e40f5 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/pom.xml
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/pom.xml
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/AbstractGenerator.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/AbstractGenerator.java
index 3566d4242ef..3566d4242ef 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/AbstractGenerator.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/AbstractGenerator.java
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ApplyStereotypeAdviceRule.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ApplyStereotypeAdviceRule.xtend
index bd8d1453084..bd8d1453084 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ApplyStereotypeAdviceRule.xtend
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ApplyStereotypeAdviceRule.xtend
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ConfigurationSetRule.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ConfigurationSetRule.xtend
index 967761ec9f9..967761ec9f9 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ConfigurationSetRule.xtend
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ConfigurationSetRule.xtend
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ElementTypeRule.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ElementTypeRule.xtend
index f5baef30d92..f5baef30d92 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ElementTypeRule.xtend
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ElementTypeRule.xtend
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ElementTypesGenerator.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ElementTypesGenerator.java
index e300a7d62f5..e300a7d62f5 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ElementTypesGenerator.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ElementTypesGenerator.java
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/GeneratorModule.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/GeneratorModule.java
index 1a69f63f9c7..1a69f63f9c7 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/GeneratorModule.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/GeneratorModule.java
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/Identifiers.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/Identifiers.xtend
index da481b5b79e..da481b5b79e 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/Identifiers.xtend
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/Identifiers.xtend
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ImpliedExtension.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ImpliedExtension.xtend
index 97cc26e94e2..97cc26e94e2 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ImpliedExtension.xtend
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ImpliedExtension.xtend
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/InputModel.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/InputModel.java
index 08eb000227a..08eb000227a 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/InputModel.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/InputModel.java
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/OutputModel.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/OutputModel.java
index 50b34bb4a98..50b34bb4a98 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/OutputModel.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/OutputModel.java
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/UML.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/UML.xtend
index 3befa66d888..3befa66d888 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/UML.xtend
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/UML.xtend
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/UMLElementTypes.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/UMLElementTypes.xtend
index 74c3fddcac2..74c3fddcac2 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/UMLElementTypes.xtend
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/UMLElementTypes.xtend
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/internal/Activator.java b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/internal/Activator.java
index d7461b9aa10..d7461b9aa10 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/internal/Activator.java
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/internal/Activator.java
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/xtend-gen/.gitignore b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/xtend-gen/.gitignore
index ee1d87867e7..ee1d87867e7 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/xtend-gen/.gitignore
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/xtend-gen/.gitignore
diff --git a/plugins/uml/assistants/pom.xml b/plugins/toolsmiths/assistants/pom.xml
index 83c34c3e619..99afe94c045 100644
--- a/plugins/uml/assistants/pom.xml
+++ b/plugins/toolsmiths/assistants/pom.xml
@@ -5,7 +5,7 @@
 	<packaging>pom</packaging>
 	<parent>
 	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml</artifactId>
+	    <artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 	    <version>0.0.1-SNAPSHOT</version>
     </parent>
 	<name>Papyrus UML Assistants</name>
@@ -16,5 +16,7 @@
 		<module>org.eclipse.papyrus.uml.profile.assistants.generator.ui</module>
 		<module>org.eclipse.papyrus.uml.profile.types.generator</module>
 		<module>org.eclipse.papyrus.uml.profile.types.generator.ui</module>
+		<module>org.eclipse.papyrus.uml.profile.newchildmenu.generator</module>
+		<module>org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui</module>
 	</modules>
 </project>
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.codegen/.classpath
index eca7bdba8f0..eca7bdba8f0 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/.classpath
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/.classpath
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/.project b/plugins/toolsmiths/org.eclipse.papyrus.codegen/.project
index d627a772b68..d627a772b68 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/.project
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/.project
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/org.eclipse.papyrus.codegen/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.ui/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/org.eclipse.papyrus.codegen/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.ui/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.codegen/.settings/org.eclipse.jdt.core.prefs
index b3aa6d60f94..b3aa6d60f94 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/org.eclipse.papyrus.codegen/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/org.eclipse.papyrus.codegen/.settings/org.eclipse.pde.api.tools.prefs
index 23fb95e120f..23fb95e120f 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF
index 0e270123c73..0e270123c73 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/about.html b/plugins/toolsmiths/org.eclipse.papyrus.codegen/about.html
index 23506a4bae1..23506a4bae1 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/about.html
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/about.html
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.codegen/build.properties
index 687dcfda295..687dcfda295 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/build.properties
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.codegen/plugin.properties
index c951b54bee9..c951b54bee9 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/plugin.properties
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.codegen/plugin.xml
index 198fd989808..198fd989808 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/plugin.xml
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.codegen/pom.xml
index 5630c9df6f6..c85294e60b5 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/pom.xml
@@ -3,7 +3,7 @@
 	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.developer</artifactId>
+    	<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/resource/PapyrusLogo16x16.gif b/plugins/toolsmiths/org.eclipse.papyrus.codegen/resource/PapyrusLogo16x16.gif
index a32f4b1b572..a32f4b1b572 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/resource/PapyrusLogo16x16.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/resource/PapyrusLogo16x16.gif
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/Activator.java b/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/Activator.java
index b517b364d6d..b517b364d6d 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/Activator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/Activator.java
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusCodegenEmitters.java b/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusCodegenEmitters.java
index df97b3f0e2b..df97b3f0e2b 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusCodegenEmitters.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusCodegenEmitters.java
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusExecuteTemplatesOperation.java b/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusExecuteTemplatesOperation.java
index 75ea973e061..75ea973e061 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusExecuteTemplatesOperation.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusExecuteTemplatesOperation.java
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusGenerator.java b/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusGenerator.java
index 5cee3e7ba91..5cee3e7ba91 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusGenerator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusGenerator.java
diff --git a/plugins/developer/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/actions/PapyrusExecuteTemplateAction.java b/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/actions/PapyrusExecuteTemplateAction.java
index 04a9b88288d..04a9b88288d 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/actions/PapyrusExecuteTemplateAction.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/actions/PapyrusExecuteTemplateAction.java
diff --git a/plugins/developer/org.eclipse.papyrus.def/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.def/.classpath
index 2b33b90779b..2b33b90779b 100644
--- a/plugins/developer/org.eclipse.papyrus.def/.classpath
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/.classpath
diff --git a/plugins/developer/org.eclipse.papyrus.def/.project b/plugins/toolsmiths/org.eclipse.papyrus.def/.project
index 2d16d0466af..2d16d0466af 100644
--- a/plugins/developer/org.eclipse.papyrus.def/.project
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/.project
diff --git a/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/org.eclipse.papyrus.def/.settings/org.eclipse.core.resources.prefs
index e10e3165bba..e10e3165bba 100644
--- a/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/org.eclipse.papyrus.def/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.def/.settings/org.eclipse.jdt.core.prefs
index 41b887bd50e..41b887bd50e 100644
--- a/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/org.eclipse.papyrus.def/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.m2e.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.def/.settings/org.eclipse.m2e.core.prefs
index f897a7f1cb2..f897a7f1cb2 100644
--- a/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.m2e.core.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/.settings/org.eclipse.m2e.core.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/org.eclipse.papyrus.def/.settings/org.eclipse.pde.api.tools.prefs
index 23fb95e120f..23fb95e120f 100644
--- a/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/toolsmiths/org.eclipse.papyrus.def/.settings/org.eclipse.xtend.core.Xtend.prefs
index df3c3c49d40..df3c3c49d40 100644
--- a/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.xtend.core.Xtend.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/.settings/org.eclipse.xtend.core.Xtend.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.xtend.shared.ui.prefs b/plugins/toolsmiths/org.eclipse.papyrus.def/.settings/org.eclipse.xtend.shared.ui.prefs
index 89103792688..89103792688 100644
--- a/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.xtend.shared.ui.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/.settings/org.eclipse.xtend.shared.ui.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.def/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.def/META-INF/MANIFEST.MF
index e14e7535af3..e14e7535af3 100644
--- a/plugins/developer/org.eclipse.papyrus.def/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/META-INF/MANIFEST.MF
diff --git a/plugins/developer/org.eclipse.papyrus.def/about.html b/plugins/toolsmiths/org.eclipse.papyrus.def/about.html
index 23506a4bae1..23506a4bae1 100644
--- a/plugins/developer/org.eclipse.papyrus.def/about.html
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/about.html
diff --git a/plugins/developer/org.eclipse.papyrus.def/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.def/build.properties
index 057f0ec72ef..057f0ec72ef 100644
--- a/plugins/developer/org.eclipse.papyrus.def/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/build.properties
diff --git a/plugins/developer/org.eclipse.papyrus.def/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.def/plugin.properties
index 76b9bbd92d7..76b9bbd92d7 100644
--- a/plugins/developer/org.eclipse.papyrus.def/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/plugin.properties
diff --git a/plugins/developer/org.eclipse.papyrus.def/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.def/pom.xml
index 02c8550e469..784f65949f1 100644
--- a/plugins/developer/org.eclipse.papyrus.def/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/pom.xml
@@ -3,7 +3,7 @@
 	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.developer</artifactId>
+    	<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/.gitignore b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend-gen/.gitignore
index c96a04f008e..c96a04f008e 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/.gitignore
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend-gen/.gitignore
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/ChildNodeLabelEditPart.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/ChildNodeLabelEditPart.xtend
index cd724aac1d1..cd724aac1d1 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/ChildNodeLabelEditPart.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/ChildNodeLabelEditPart.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/CompartmentEditPart.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/CompartmentEditPart.xtend
index 1afae6e2876..1afae6e2876 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/CompartmentEditPart.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/CompartmentEditPart.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/DiagramEditPart.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/DiagramEditPart.xtend
index a6e7c02d13d..a6e7c02d13d 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/DiagramEditPart.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/DiagramEditPart.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/ExternalNodeLabelEditPart.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/ExternalNodeLabelEditPart.xtend
index 604015ede6b..604015ede6b 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/ExternalNodeLabelEditPart.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/ExternalNodeLabelEditPart.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/LinkEditPart.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/LinkEditPart.xtend
index 5875e8c2c64..5875e8c2c64 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/LinkEditPart.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/LinkEditPart.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/LinkLabelEditPart.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/LinkLabelEditPart.xtend
index e4866434ac2..e4866434ac2 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/LinkLabelEditPart.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/LinkLabelEditPart.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/NodeEditPart.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/NodeEditPart.xtend
index d79b500c2ae..d79b500c2ae 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/NodeEditPart.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/NodeEditPart.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/NodeLabelEditPart.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/NodeLabelEditPart.xtend
index effa52d178c..effa52d178c 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/NodeLabelEditPart.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/NodeLabelEditPart.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/actions/LoadResourceAction.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/actions/LoadResourceAction.xtend
index 5b903b1d792..5b903b1d792 100755
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/actions/LoadResourceAction.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/actions/LoadResourceAction.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ChildNodeLabelEditPart.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ChildNodeLabelEditPart.xtend
index aab60587751..aab60587751 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ChildNodeLabelEditPart.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ChildNodeLabelEditPart.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ChoiceUtils_qvto.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ChoiceUtils_qvto.xtend
index 38e0ccecec7..38e0ccecec7 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ChoiceUtils_qvto.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ChoiceUtils_qvto.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/CompartmentEditPart.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/CompartmentEditPart.xtend
index 8ec2edaf53e..8ec2edaf53e 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/CompartmentEditPart.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/CompartmentEditPart.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/DiagramEditPart.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/DiagramEditPart.xtend
index 44075206b8b..44075206b8b 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/DiagramEditPart.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/DiagramEditPart.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ExternalNodeLabelEditPart.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ExternalNodeLabelEditPart.xtend
index a2dec74c795..a2dec74c795 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ExternalNodeLabelEditPart.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ExternalNodeLabelEditPart.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/LinkEditPart.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/LinkEditPart.xtend
index 5fd8ade4588..5fd8ade4588 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/LinkEditPart.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/LinkEditPart.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/LinkLabelEditPart.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/LinkLabelEditPart.xtend
index 6c1be9c56b0..6c1be9c56b0 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/LinkLabelEditPart.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/LinkLabelEditPart.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeEditPart.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeEditPart.xtend
index 78cc989408a..78cc989408a 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeEditPart.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeEditPart.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeLabelEditPart.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeLabelEditPart.xtend
index 5e0d1cb8524..5e0d1cb8524 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeLabelEditPart.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeLabelEditPart.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend
index 6dc08068748..6dc08068748 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/update/CanonicalUpdate.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/update/CanonicalUpdate.xtend
index 6e4fe0a5516..6e4fe0a5516 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/update/CanonicalUpdate.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/update/CanonicalUpdate.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/parsers/ParserProvider.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/parsers/ParserProvider.xtend
index 7d21bab98fb..7d21bab98fb 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/parsers/ParserProvider.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/parsers/ParserProvider.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/preferences/StandardPage.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/preferences/StandardPage.xtend
index f934212e028..f934212e028 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/preferences/StandardPage.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/impl/preferences/StandardPage.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/metamodel/Facility.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/metamodel/Facility.xtend
index 7d9127b2272..7d9127b2272 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/metamodel/Facility.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/metamodel/Facility.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/metamodel/MetaModel.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/metamodel/MetaModel.xtend
index 6c597db0afb..6c597db0afb 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/metamodel/MetaModel.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/metamodel/MetaModel.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/parsers/PredefinedParser.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/parsers/PredefinedParser.xtend
index 881e7e7edf0..881e7e7edf0 100755
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/parsers/PredefinedParser.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/parsers/PredefinedParser.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/CodeStyle.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/CodeStyle.xtend
index 7b56ab74a76..7b56ab74a76 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/CodeStyle.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/CodeStyle.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/Common.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/Common.xtend
index 58a5807bc5e..58a5807bc5e 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/Common.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/Common.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/QualifiedClassNameProvider.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/QualifiedClassNameProvider.xtend
index cb73c870eef..cb73c870eef 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/QualifiedClassNameProvider.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/QualifiedClassNameProvider.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/commands/CreateLinkUtils.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/commands/CreateLinkUtils.xtend
index 3017f6719d9..3017f6719d9 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/commands/CreateLinkUtils.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/commands/CreateLinkUtils.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/commands/CreateNodeCommand.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/commands/CreateNodeCommand.xtend
index ab940ff8036..ab940ff8036 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/commands/CreateNodeCommand.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/commands/CreateNodeCommand.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/commands/ReorientLinkUtils.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/commands/ReorientLinkUtils.xtend
index acc4f6bfbf4..acc4f6bfbf4 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/commands/ReorientLinkUtils.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/commands/ReorientLinkUtils.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/edithelpers/BaseEditHelper.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/edithelpers/BaseEditHelper.xtend
index 491519a8f33..491519a8f33 100755
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/edithelpers/BaseEditHelper.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/edithelpers/BaseEditHelper.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/edithelpers/EditHelper.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/edithelpers/EditHelper.xtend
index 59987137756..59987137756 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/edithelpers/EditHelper.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/edithelpers/EditHelper.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editparts/Common.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editparts/Common.xtend
index 992cfd621c7..992cfd621c7 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editparts/Common.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editparts/Common.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editparts/EditPartFactory.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editparts/EditPartFactory.xtend
index 4d9935befe9..4d9935befe9 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editparts/EditPartFactory.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editparts/EditPartFactory.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/BaseItemSemanticEditPolicy.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/BaseItemSemanticEditPolicy.xtend
index e211ac08408..e211ac08408 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/BaseItemSemanticEditPolicy.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/BaseItemSemanticEditPolicy.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/CompartmentItemSemanticEditPolicy.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/CompartmentItemSemanticEditPolicy.xtend
index 846bc041d6e..846bc041d6e 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/CompartmentItemSemanticEditPolicy.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/CompartmentItemSemanticEditPolicy.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/DiagramItemSemanticEditPolicy.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/DiagramItemSemanticEditPolicy.xtend
index 70e7cd045fd..70e7cd045fd 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/DiagramItemSemanticEditPolicy.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/DiagramItemSemanticEditPolicy.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xtend
index 6e90c98ed11..6e90c98ed11 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/NodeItemSemanticEditPolicy.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/NodeItemSemanticEditPolicy.xtend
index 793aa38e235..793aa38e235 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/NodeItemSemanticEditPolicy.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/NodeItemSemanticEditPolicy.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/OpenDiagram.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/OpenDiagram.xtend
index a0fa5e6fdf1..a0fa5e6fdf1 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/OpenDiagram.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/OpenDiagram.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/TextNonResizableEditPolicy.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/TextNonResizableEditPolicy.xtend
index 2487fbd04ec..2487fbd04ec 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/TextNonResizableEditPolicy.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/TextNonResizableEditPolicy.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/TextSelectionEditPolicy.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/TextSelectionEditPolicy.xtend
index f9eeda69216..f9eeda69216 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/TextSelectionEditPolicy.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/TextSelectionEditPolicy.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/Utils_qvto.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/Utils_qvto.xtend
index 4eb215bd4d6..4eb215bd4d6 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/Utils_qvto.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/Utils_qvto.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/childContainerCreateCommand.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/childContainerCreateCommand.xtend
index b6edf38f735..b6edf38f735 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/childContainerCreateCommand.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/childContainerCreateCommand.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/linkCommands.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/linkCommands.xtend
index 0b053d973f3..0b053d973f3 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/linkCommands.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/linkCommands.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/preferences/PreferenceInitializer.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/preferences/PreferenceInitializer.xtend
index fcfd307dae9..fcfd307dae9 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/preferences/PreferenceInitializer.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/preferences/PreferenceInitializer.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/preferences/extensions.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/preferences/extensions.xtend
index 0e890118934..0e890118934 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/preferences/extensions.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/preferences/extensions.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/DiagramUpdater.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/DiagramUpdater.xtend
index 917f24898af..917f24898af 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/DiagramUpdater.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/DiagramUpdater.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/Extensions.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/Extensions.xtend
index a402f262ff2..a402f262ff2 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/Extensions.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/Extensions.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/LinkDescriptor.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/LinkDescriptor.xtend
index d5ebb0ee871..d5ebb0ee871 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/LinkDescriptor.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/LinkDescriptor.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/NodeDescriptor.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/NodeDescriptor.xtend
index 5dbb3e1e4ae..5dbb3e1e4ae 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/NodeDescriptor.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/NodeDescriptor.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/views/ViewStyles.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/views/ViewStyles.xtend
index bc7e4fc26bb..bc7e4fc26bb 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/views/ViewStyles.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/views/ViewStyles.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/ActionBarContributor.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/ActionBarContributor.xtend
index a9b3fa8ab2d..a9b3fa8ab2d 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/ActionBarContributor.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/ActionBarContributor.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/CreationWizard.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/CreationWizard.xtend
index 29754ba7811..29754ba7811 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/CreationWizard.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/CreationWizard.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DeleteElementAction.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DeleteElementAction.xtend
index dff428d05d8..dff428d05d8 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DeleteElementAction.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DeleteElementAction.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DiagramContentInitializer.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DiagramContentInitializer.xtend
index 02b9853d772..02b9853d772 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DiagramContentInitializer.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DiagramContentInitializer.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DiagramEditorContextMenuProvider.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DiagramEditorContextMenuProvider.xtend
index 07c5e97ef5f..07c5e97ef5f 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DiagramEditorContextMenuProvider.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DiagramEditorContextMenuProvider.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DiagramEditorUtil.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DiagramEditorUtil.xtend
index 0fa3f092235..0fa3f092235 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DiagramEditorUtil.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DiagramEditorUtil.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DocumentProvider.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DocumentProvider.xtend
index 5d809566671..5d809566671 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DocumentProvider.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DocumentProvider.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/Editor.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/Editor.xtend
index 435690d4f88..435690d4f88 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/Editor.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/Editor.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/InitDiagramFileAction.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/InitDiagramFileAction.xtend
index af515676fe1..af515676fe1 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/InitDiagramFileAction.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/InitDiagramFileAction.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/ModelElementSelectionPage.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/ModelElementSelectionPage.xtend
index d536a3b4df8..d536a3b4df8 100755
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/ModelElementSelectionPage.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/ModelElementSelectionPage.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/NewDiagramFileWizard.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/NewDiagramFileWizard.xtend
index 3e836230ef3..3e836230ef3 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/NewDiagramFileWizard.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/NewDiagramFileWizard.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/ResourceSetInfo.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/ResourceSetInfo.xtend
index bd5de605a1b..bd5de605a1b 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/ResourceSetInfo.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/ResourceSetInfo.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/ResourceSetModificationListener.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/ResourceSetModificationListener.xtend
index eaddf4da755..eaddf4da755 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/ResourceSetModificationListener.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/ResourceSetModificationListener.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/ValidateAction.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/ValidateAction.xtend
index c22da0057c8..c22da0057c8 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/ValidateAction.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/ValidateAction.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/VisualIDRegistry.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/VisualIDRegistry.xtend
index e5fe0afb9f3..e5fe0afb9f3 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/VisualIDRegistry.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/VisualIDRegistry.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/extensions.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/extensions.xtend
index 5ed49a3255a..5ed49a3255a 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/extensions.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/extensions.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/palette/PaletteConfiguration.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/palette/PaletteConfiguration.xtend
index db9c8b642ca..db9c8b642ca 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/palette/PaletteConfiguration.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/palette/PaletteConfiguration.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/palette/PaletteFactory.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/palette/PaletteFactory.xtend
index 73366e5576e..73366e5576e 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/palette/PaletteFactory.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/palette/PaletteFactory.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/palette/Utils_qvto.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/palette/Utils_qvto.xtend
index 076d98204a9..076d98204a9 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/palette/Utils_qvto.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/palette/Utils_qvto.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/expressions/AbstractExpression.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/expressions/AbstractExpression.xtend
index 0cd13c1a923..0cd13c1a923 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/expressions/AbstractExpression.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/expressions/AbstractExpression.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/AbstractNavigatorItem.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/AbstractNavigatorItem.xtend
index d729966b66b..d729966b66b 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/AbstractNavigatorItem.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/AbstractNavigatorItem.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/DomainNavigatorContentProvider.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/DomainNavigatorContentProvider.xtend
index 99bccffe2cb..99bccffe2cb 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/DomainNavigatorContentProvider.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/DomainNavigatorContentProvider.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/DomainNavigatorItem.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/DomainNavigatorItem.xtend
index e8e32303b09..e8e32303b09 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/DomainNavigatorItem.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/DomainNavigatorItem.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorContentProvider.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorContentProvider.xtend
index 7a3a47a1c69..7a3a47a1c69 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorContentProvider.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorContentProvider.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorGroup.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorGroup.xtend
index a700b38c498..a700b38c498 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorGroup.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorGroup.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorItem.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorItem.xtend
index 8f3292085b9..8f3292085b9 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorItem.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorItem.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorLabelProvider.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorLabelProvider.xtend
index 828e09e6396..828e09e6396 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorLabelProvider.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorLabelProvider.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorLinkHelper.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorLinkHelper.xtend
index 58f11dd415f..58f11dd415f 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorLinkHelper.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorLinkHelper.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorSorter.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorSorter.xtend
index 1bb05d61ecc..1bb05d61ecc 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorSorter.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/navigator/NavigatorSorter.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/ActivatorImpl.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/ActivatorImpl.xtend
index 124ae49cc9a..124ae49cc9a 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/ActivatorImpl.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/ActivatorImpl.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/manifest.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/manifest.xtend
index 143ecf9318b..143ecf9318b 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/manifest.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/manifest.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/plugin.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/plugin.xtend
index a9070fe132a..a9070fe132a 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/plugin.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/plugin.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/propsheet/LabelProvider.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/propsheet/LabelProvider.xtend
index 4a89c0aa92c..4a89c0aa92c 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/propsheet/LabelProvider.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/propsheet/LabelProvider.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/propsheet/PropertySection.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/propsheet/PropertySection.xtend
index 7bac07d23da..7bac07d23da 100755
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/propsheet/PropertySection.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/propsheet/PropertySection.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/EditPartProvider.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/EditPartProvider.xtend
index e09576f2734..e09576f2734 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/EditPartProvider.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/EditPartProvider.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ElementInitializers.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ElementInitializers.xtend
index 71386368974..71386368974 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ElementInitializers.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ElementInitializers.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ElementInitializers_qvto.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ElementInitializers_qvto.xtend
index a080481eabc..a080481eabc 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ElementInitializers_qvto.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ElementInitializers_qvto.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ElementTypes.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ElementTypes.xtend
index acdc1f41c32..acdc1f41c32 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ElementTypes.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ElementTypes.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/IconProvider.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/IconProvider.xtend
index 3117626b436..3117626b436 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/IconProvider.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/IconProvider.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/MarkerNavigationProvider.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/MarkerNavigationProvider.xtend
index 75f9fd4cd94..75f9fd4cd94 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/MarkerNavigationProvider.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/MarkerNavigationProvider.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ParserUtils_qvto.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ParserUtils_qvto.xtend
index 67ccb8b081d..67ccb8b081d 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ParserUtils_qvto.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ParserUtils_qvto.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ValidationDecoratorProvider.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ValidationDecoratorProvider.xtend
index 746fe141cf9..746fe141cf9 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ValidationDecoratorProvider.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ValidationDecoratorProvider.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ValidationProvider.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ValidationProvider.xtend
index 88db7f9eeed..88db7f9eeed 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ValidationProvider.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ValidationProvider.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ViewProvider.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ViewProvider.xtend
index bb610d57672..bb610d57672 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ViewProvider.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ViewProvider.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/VisualTypeProvider.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/VisualTypeProvider.xtend
index 594db96b084..594db96b084 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/VisualTypeProvider.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/VisualTypeProvider.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/extensions.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/extensions.xtend
index f8e6615941d..f8e6615941d 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/extensions.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/extensions.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/utils/EditHelperUtils_qvto.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/utils/EditHelperUtils_qvto.xtend
index 803f5520deb..803f5520deb 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/utils/EditHelperUtils_qvto.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/utils/EditHelperUtils_qvto.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/utils/EditPartsUtils_qvto.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/utils/EditPartsUtils_qvto.xtend
index 7eaa6525c7f..7eaa6525c7f 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/utils/EditPartsUtils_qvto.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/utils/EditPartsUtils_qvto.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/utils/NodeConstraintUtils_qvto.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/utils/NodeConstraintUtils_qvto.xtend
index 963cc1120c5..963cc1120c5 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/utils/NodeConstraintUtils_qvto.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/utils/NodeConstraintUtils_qvto.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/utils/PrefsConstant_qvto.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/utils/PrefsConstant_qvto.xtend
index 314a97776e8..314a97776e8 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/utils/PrefsConstant_qvto.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/utils/PrefsConstant_qvto.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/utils/UtilsItemSemanticEditPolicy.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/utils/UtilsItemSemanticEditPolicy.xtend
index 0999d8861f8..0999d8861f8 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/utils/UtilsItemSemanticEditPolicy.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/utils/UtilsItemSemanticEditPolicy.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.classpath
index 6e0118384c8..6e0118384c8 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/.classpath
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.classpath
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/.project b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.project
index 0716f8aa568..0716f8aa568 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/.project
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.project
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c4..f08be2b06c4 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.pde.api.tools.prefs
index 23fb95e120f..23fb95e120f 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.xtend.core.Xtend.prefs
index 110a6e417d3..110a6e417d3 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.xtend.core.Xtend.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.xtend.core.Xtend.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF
index d0fd7b937dc..d0fd7b937dc 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF
diff --git a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/about.html b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/about.html
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/about.html
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/build.properties
index 9479db4e30d..9479db4e30d 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/build.properties
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/plugin.properties
index 4ad522e06de..4ad522e06de 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/plugin.properties
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/plugin.xml
index e8ac7bac70b..e8ac7bac70b 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/plugin.xml
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/pom.xml
index 5dd5c869c1f..829aab79019 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/pom.xml
@@ -3,7 +3,7 @@
 	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.developer</artifactId>
+    	<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypeToAssistantRule.xtend b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypeToAssistantRule.xtend
index 268b2176800..268b2176800 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypeToAssistantRule.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypeToAssistantRule.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypesToAssistantsGenerator.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypesToAssistantsGenerator.java
index 71c6a104385..71c6a104385 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypesToAssistantsGenerator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypesToAssistantsGenerator.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GMFGenToAssistantRule.xtend b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GMFGenToAssistantRule.xtend
index 0e3959dac5a..0e3959dac5a 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GMFGenToAssistantRule.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GMFGenToAssistantRule.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GMFGenToAssistantsGenerator.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GMFGenToAssistantsGenerator.java
index 588d759be45..588d759be45 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GMFGenToAssistantsGenerator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GMFGenToAssistantsGenerator.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GeneratorModule.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GeneratorModule.java
index 581c9db6fd8..581c9db6fd8 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GeneratorModule.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GeneratorModule.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ModelingAssistantProviderRule.xtend b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ModelingAssistantProviderRule.xtend
index 71d49e0dc6f..71d49e0dc6f 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ModelingAssistantProviderRule.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ModelingAssistantProviderRule.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/internal/Activator.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/internal/Activator.java
index f8dacf27881..f8dacf27881 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/internal/Activator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/internal/Activator.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/internal/handlers/AddPopupBarEditPolicyHandler.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/internal/handlers/AddPopupBarEditPolicyHandler.java
index ba398f24bf4..ba398f24bf4 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/internal/handlers/AddPopupBarEditPolicyHandler.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/internal/handlers/AddPopupBarEditPolicyHandler.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/internal/handlers/GenerateModelingAssistantsFromElementTypesHandler.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/internal/handlers/GenerateModelingAssistantsFromElementTypesHandler.java
index e21fe366766..e21fe366766 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/internal/handlers/GenerateModelingAssistantsFromElementTypesHandler.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/internal/handlers/GenerateModelingAssistantsFromElementTypesHandler.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/internal/handlers/GenerateModelingAssistantsFromGMFGenHandler.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/internal/handlers/GenerateModelingAssistantsFromGMFGenHandler.java
index 1d6493f7ca2..1d6493f7ca2 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/internal/handlers/GenerateModelingAssistantsFromGMFGenHandler.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/internal/handlers/GenerateModelingAssistantsFromGMFGenHandler.java
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/xtend-gen/.gitignore b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/xtend-gen/.gitignore
index ee1d87867e7..ee1d87867e7 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/xtend-gen/.gitignore
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/xtend-gen/.gitignore
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.classpath
index 64c5e31b7a2..64c5e31b7a2 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/.classpath
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.classpath
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/.project b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.project
index b0ea7f36421..b0ea7f36421 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/.project
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.project
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.jdt.core.prefs
index c585cc455ae..c585cc455ae 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.pde.api.tools.prefs
index 23fb95e120f..23fb95e120f 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/META-INF/MANIFEST.MF
index 2180256012f..2180256012f 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/META-INF/MANIFEST.MF
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/about.html b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/about.html
index bc57a4aa9b5..bc57a4aa9b5 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/about.html
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/about.html
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/build.properties
index 9f45063bc21..9f45063bc21 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/build.properties
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/icons/classf_obj.gif b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/icons/classf_obj.gif
index 365e3721618..365e3721618 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/icons/classf_obj.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/icons/classf_obj.gif
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/icons/file_obj.gif b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/icons/file_obj.gif
index 7ccc6a70317..7ccc6a70317 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/icons/file_obj.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/icons/file_obj.gif
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/icons/jar_obj.gif b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/icons/jar_obj.gif
index 2fa1d777bc7..2fa1d777bc7 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/icons/jar_obj.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/icons/jar_obj.gif
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/icons/packagefolder_obj.gif b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/icons/packagefolder_obj.gif
index fca9c53e629..fca9c53e629 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/icons/packagefolder_obj.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/icons/packagefolder_obj.gif
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/icons/plugin_obj.gif b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/icons/plugin_obj.gif
index 8493df40dfe..8493df40dfe 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/icons/plugin_obj.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/icons/plugin_obj.gif
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/icons/sample.gif b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/icons/sample.gif
index 34fb3c9d8cb..34fb3c9d8cb 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/icons/sample.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/icons/sample.gif
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/plugin.properties
index f1e2732c6fd..f1e2732c6fd 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/plugin.properties
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/plugin.xml
index 339cd36acb5..339cd36acb5 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/plugin.xml
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/pom.xml
index ded449c439a..306703889f6 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/pom.xml
@@ -3,7 +3,7 @@
 	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.developer</artifactId>
+    	<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/Activator.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/Activator.java
index 4782d62965b..4782d62965b 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/Activator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/Activator.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/EmbeddedFile.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/EmbeddedFile.java
index 8bbe4381173..8bbe4381173 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/EmbeddedFile.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/EmbeddedFile.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PhysicalFile.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PhysicalFile.java
index 926dceb3e89..926dceb3e89 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PhysicalFile.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PhysicalFile.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/Plugin.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/Plugin.java
index 8bf11c9910d..8bf11c9910d 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/Plugin.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/Plugin.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginEntry.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginEntry.java
index 8813f814448..8813f814448 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginEntry.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginEntry.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginsContentDialog.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginsContentDialog.java
index 3dfcd7b6de8..3dfcd7b6de8 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginsContentDialog.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginsContentDialog.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginsContentLabelProvider.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginsContentLabelProvider.java
index 4e422ed0123..4e422ed0123 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginsContentLabelProvider.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginsContentLabelProvider.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginsContentProvider.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginsContentProvider.java
index 3d89323e39c..3d89323e39c 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginsContentProvider.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginsContentProvider.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginsContentSelectionValidator.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginsContentSelectionValidator.java
index 7850dd5c679..7850dd5c679 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginsContentSelectionValidator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginsContentSelectionValidator.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginsContentView.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginsContentView.java
index 002620345fe..002620345fe 100755
--- a/plugins/developer/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginsContentView.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/src/org/eclipse/papyrus/dev/pluginexplorer/PluginsContentView.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.classpath
index eca7bdba8f0..eca7bdba8f0 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/.classpath
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.classpath
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/.project b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.project
index aeac3483e1f..aeac3483e1f 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/.project
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.project
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.jdt.core.prefs
index b3aa6d60f94..b3aa6d60f94 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.pde.api.tools.prefs
index 23fb95e120f..23fb95e120f 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/META-INF/MANIFEST.MF
index ffd58f5e7f9..ffd58f5e7f9 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/META-INF/MANIFEST.MF
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/OSGI-INF/l10n/bundle.properties b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/OSGI-INF/l10n/bundle.properties
index 0c4249d2390..0c4249d2390 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/OSGI-INF/l10n/bundle.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/OSGI-INF/l10n/bundle.properties
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/about.html b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/about.html
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/about.html
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/build.properties
index 6d4fb79f8a8..6d4fb79f8a8 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/build.properties
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/icons/copyright_icon.png b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/icons/copyright_icon.png
index df9393d4f01..df9393d4f01 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/icons/copyright_icon.png
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/icons/copyright_icon.png
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/icons/feature_obj.gif b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/icons/feature_obj.gif
index 8706680c793..8706680c793 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/icons/feature_obj.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/icons/feature_obj.gif
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/icons/html.gif b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/icons/html.gif
index ec6cca4525b..ec6cca4525b 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/icons/html.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/icons/html.gif
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/icons/papyrus.png b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/icons/papyrus.png
index 0f74e27b483..0f74e27b483 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/icons/papyrus.png
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/icons/papyrus.png
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/icons/plugin_mf_obj.gif b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/icons/plugin_mf_obj.gif
index eedacd2b7aa..eedacd2b7aa 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/icons/plugin_mf_obj.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/icons/plugin_mf_obj.gif
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/icons/plugin_obj.gif b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/icons/plugin_obj.gif
index 8493df40dfe..8493df40dfe 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/icons/plugin_obj.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/icons/plugin_obj.gif
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/icons/version.gif b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/icons/version.gif
index d2d5d765def..d2d5d765def 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/icons/version.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/icons/version.gif
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/icons/version.png b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/icons/version.png
index 248a6ae5ce1..248a6ae5ce1 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/icons/version.png
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/icons/version.png
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/plugin.xml
index ecb870b08d5..ecb870b08d5 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/plugin.xml
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/pom.xml
index 6a37b80a5fb..595caeeb7ee 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/pom.xml
@@ -3,7 +3,7 @@
 	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.developer</artifactId>
+    	<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/resources/about.html.file b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/resources/about.html.file
index 670d10856a8..670d10856a8 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/resources/about.html.file
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/resources/about.html.file
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/resources/epl-v10.html.file b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/resources/epl-v10.html.file
index cb1073a4bad..cb1073a4bad 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/resources/epl-v10.html.file
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/resources/epl-v10.html.file
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/resources/license.html.file b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/resources/license.html.file
index f19c483b9c8..f19c483b9c8 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/resources/license.html.file
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/resources/license.html.file
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/Activator.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/Activator.java
index e617aec79e6..e617aec79e6 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/Activator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/Activator.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/dialog/InputDialogWithCheckBox.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/dialog/InputDialogWithCheckBox.java
index fbf0458fc25..fbf0458fc25 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/dialog/InputDialogWithCheckBox.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/dialog/InputDialogWithCheckBox.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/dialog/TwoInputDialog.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/dialog/TwoInputDialog.java
index 3859519650c..3859519650c 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/dialog/TwoInputDialog.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/dialog/TwoInputDialog.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/AbstractAddFileHandler.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/AbstractAddFileHandler.java
index f065138362f..f065138362f 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/AbstractAddFileHandler.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/AbstractAddFileHandler.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/EnsureAPIAnalysisHandler.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/EnsureAPIAnalysisHandler.java
index b72cb3663e2..b72cb3663e2 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/EnsureAPIAnalysisHandler.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/EnsureAPIAnalysisHandler.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/SyncManifestAndPOMVersions.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/SyncManifestAndPOMVersions.java
index 66772afd2c7..66772afd2c7 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/SyncManifestAndPOMVersions.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/SyncManifestAndPOMVersions.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/features/AddFEPLFileHandler.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/features/AddFEPLFileHandler.java
index 8c90af90a31..8c90af90a31 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/features/AddFEPLFileHandler.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/features/AddFEPLFileHandler.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/features/AddFeatureLicenseFileHandler.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/features/AddFeatureLicenseFileHandler.java
index 6969911a387..6969911a387 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/features/AddFeatureLicenseFileHandler.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/features/AddFeatureLicenseFileHandler.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/features/SetCopyrightNoticeHandler.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/features/SetCopyrightNoticeHandler.java
index 9e1c21f762e..9e1c21f762e 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/features/SetCopyrightNoticeHandler.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/features/SetCopyrightNoticeHandler.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/AbstractManifestUpdateHandler.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/AbstractManifestUpdateHandler.java
index 4ff98fe50fc..4ff98fe50fc 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/AbstractManifestUpdateHandler.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/AbstractManifestUpdateHandler.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/AddProjectAboutFileHandler.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/AddProjectAboutFileHandler.java
index f452cff2fc5..f452cff2fc5 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/AddProjectAboutFileHandler.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/AddProjectAboutFileHandler.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/OpenParentPOMHandler.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/OpenParentPOMHandler.java
index a2de9c91a20..a2de9c91a20 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/OpenParentPOMHandler.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/OpenParentPOMHandler.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/OptimizeDependenciesHandler.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/OptimizeDependenciesHandler.java
index 6bca6f20f54..6bca6f20f54 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/OptimizeDependenciesHandler.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/OptimizeDependenciesHandler.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/SingletonBundleHandler.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/SingletonBundleHandler.java
index cfada4f53ec..cfada4f53ec 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/SingletonBundleHandler.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/SingletonBundleHandler.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/UpdateDependencyRangesHandler.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/UpdateDependencyRangesHandler.java
index 8bc4436c8ee..8bc4436c8ee 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/UpdateDependencyRangesHandler.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/handlers/plugins/UpdateDependencyRangesHandler.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/AbstractManifestUpdateOperation.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/AbstractManifestUpdateOperation.java
index a1252300016..a1252300016 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/AbstractManifestUpdateOperation.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/AbstractManifestUpdateOperation.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/DependencyAnalysisContext.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/DependencyAnalysisContext.java
index d268b650432..d268b650432 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/DependencyAnalysisContext.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/DependencyAnalysisContext.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/DependencyKind.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/DependencyKind.java
index b391273474b..b391273474b 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/DependencyKind.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/DependencyKind.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/OptimizeDependenciesOperation.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/OptimizeDependenciesOperation.java
index 87aed84f133..87aed84f133 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/OptimizeDependenciesOperation.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/OptimizeDependenciesOperation.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/SingletonBundle.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/SingletonBundle.java
index a9c44605937..a9c44605937 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/SingletonBundle.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/SingletonBundle.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/UpdateDependencyRangesOperation.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/UpdateDependencyRangesOperation.java
index 4a87f700b2a..4a87f700b2a 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/UpdateDependencyRangesOperation.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/UpdateDependencyRangesOperation.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java
index 431d632fa29..431d632fa29 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/utils/Utils.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/utils/Utils.java
index 5419f815b20..5419f815b20 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/utils/Utils.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/utils/Utils.java
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.classpath
index 248b4c5dc7a..248b4c5dc7a 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.classpath
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.classpath
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/.project b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.project
index 14cb793e53b..14cb793e53b 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/.project
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.project
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c4..f08be2b06c4 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap
index 82de326117f..82de326117f 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.settings/org.eclipse.pde.api.tools.prefs
index 23fb95e120f..23fb95e120f 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF
index 4753f551c02..4753f551c02 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/about.html b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/about.html
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/about.html
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/build.properties
index 5f460d66db9..5f460d66db9 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/build.properties
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/icons/Papyrus.gif b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/icons/Papyrus.gif
index 8a31f458379..8a31f458379 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/icons/Papyrus.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/icons/Papyrus.gif
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/plugin.properties
index 99fb4e221d9..99fb4e221d9 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/plugin.properties
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/plugin.xml
index 9d0f7c94998..9d0f7c94998 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/plugin.xml
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/pom.xml
index 72442344e40..7af9b6d544f 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/pom.xml
@@ -2,7 +2,7 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.developer</artifactId>
+    	<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/Activator.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/Activator.java
index e42d7fc21f8..e42d7fc21f8 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/Activator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/Activator.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/generator/ElementTypeRegistryGenerator.xtend b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/generator/ElementTypeRegistryGenerator.xtend
index 260c3d727b7..260c3d727b7 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/generator/ElementTypeRegistryGenerator.xtend
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/generator/ElementTypeRegistryGenerator.xtend
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/ElementTypeInfo.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/ElementTypeInfo.java
index 692f8220f1c..692f8220f1c 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/ElementTypeInfo.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/ElementTypeInfo.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/GenerateElementTypesRegistry.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/GenerateElementTypesRegistry.java
index d355447296d..d355447296d 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/GenerateElementTypesRegistry.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/GenerateElementTypesRegistry.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/MigrateSpecializations.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/MigrateSpecializations.java
index 258976c9bc3..258976c9bc3 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/MigrateSpecializations.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/MigrateSpecializations.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/MigrateTypesConfigurations.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/MigrateTypesConfigurations.java
index 0d39894b1bd..0d39894b1bd 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/MigrateTypesConfigurations.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/MigrateTypesConfigurations.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesContentProvider.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesContentProvider.java
index 984594e82d4..984594e82d4 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesContentProvider.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesContentProvider.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesDetailsContentProvider.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesDetailsContentProvider.java
index 3f6bf29481b..3f6bf29481b 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesDetailsContentProvider.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesDetailsContentProvider.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesDetailsLabelProvider.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesDetailsLabelProvider.java
index 607ba42dcf6..607ba42dcf6 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesDetailsLabelProvider.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesDetailsLabelProvider.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesLabelProvider.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesLabelProvider.java
index c89cc88d5e6..c89cc88d5e6 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesLabelProvider.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesLabelProvider.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/TypesEventContentProvider.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/TypesEventContentProvider.java
index 28d507d7ef5..28d507d7ef5 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/TypesEventContentProvider.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/TypesEventContentProvider.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/TypesEventLabelProvider.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/TypesEventLabelProvider.java
index ee532309225..ee532309225 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/TypesEventLabelProvider.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/TypesEventLabelProvider.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/EClassComparator.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/EClassComparator.java
index 25a9421e6f6..25a9421e6f6 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/EClassComparator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/EClassComparator.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/ElementTypeConfigurationComparator.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/ElementTypeConfigurationComparator.java
index b8de00edf4c..b8de00edf4c 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/ElementTypeConfigurationComparator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/ElementTypeConfigurationComparator.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/ElementTypeRegistryUtils.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/ElementTypeRegistryUtils.java
index 0b44546e382..0b44546e382 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/ElementTypeRegistryUtils.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/ElementTypeRegistryUtils.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/GenerateElementTypesConfigurationsUtils.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/GenerateElementTypesConfigurationsUtils.java
index 05a3ad24c00..05a3ad24c00 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/GenerateElementTypesConfigurationsUtils.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/GenerateElementTypesConfigurationsUtils.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/IElementTypeComparator.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/IElementTypeComparator.java
index 622d729ecd7..622d729ecd7 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/IElementTypeComparator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/IElementTypeComparator.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/NotifierNullEditHelper.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/NotifierNullEditHelper.java
index df2e84c7db1..df2e84c7db1 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/NotifierNullEditHelper.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/NotifierNullEditHelper.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/TypesEventPrinter.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/TypesEventPrinter.java
index f8213214503..f8213214503 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/TypesEventPrinter.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/TypesEventPrinter.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/view/RegistredElementTypesView.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/view/RegistredElementTypesView.java
index a1e446eb0d2..a1e446eb0d2 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/view/RegistredElementTypesView.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/view/RegistredElementTypesView.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/view/TypesConfigurationsListenerView.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/view/TypesConfigurationsListenerView.java
index 0e937b4fee0..0e937b4fee0 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/view/TypesConfigurationsListenerView.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/view/TypesConfigurationsListenerView.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/GenerateUMLDIElementTypes.qvto b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/GenerateUMLDIElementTypes.qvto
index 80e90289e45..80e90289e45 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/GenerateUMLDIElementTypes.qvto
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/GenerateUMLDIElementTypes.qvto
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/GuessVisualID.qvto b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/GuessVisualID.qvto
index 1302cc48edc..1302cc48edc 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/GuessVisualID.qvto
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/GuessVisualID.qvto
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/MigrateVisualID.qvto b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/MigrateVisualID.qvto
index 6426449c93e..6426449c93e 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/MigrateVisualID.qvto
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/MigrateVisualID.qvto
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/PrintVisualID.qvto b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/PrintVisualID.qvto
index 3088465b8b9..3088465b8b9 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/PrintVisualID.qvto
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/PrintVisualID.qvto
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/PrintVisualIDMap.qvto b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/PrintVisualIDMap.qvto
index 6e9ca8b1a78..6e9ca8b1a78 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/PrintVisualIDMap.qvto
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/PrintVisualIDMap.qvto
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/VisualIDs_1.1_To_2.0.xlsx b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/VisualIDs_1.1_To_2.0.xlsx
index a1f0cf314ed..a1f0cf314ed 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/VisualIDs_1.1_To_2.0.xlsx
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/transforms/VisualID Migration/VisualIDs_1.1_To_2.0.xlsx
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/xtend-gen/.gitignore b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/xtend-gen/.gitignore
index 1c31bab9945..1c31bab9945 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/xtend-gen/.gitignore
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/xtend-gen/.gitignore
diff --git a/plugins/developer/org.eclipse.papyrus.dev.ui/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/.classpath
index 6bd52e0f095..6bd52e0f095 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.ui/.classpath
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/.classpath
diff --git a/plugins/developer/org.eclipse.papyrus.dev.ui/.project b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/.project
index 25dceb259dd..25dceb259dd 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.ui/.project
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/.project
diff --git a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca8..0c68a61dca8 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.ui/.settings/org.eclipse.m2e.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/.settings/org.eclipse.m2e.core.prefs
index f897a7f1cb2..f897a7f1cb2 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.ui/.settings/org.eclipse.m2e.core.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/.settings/org.eclipse.m2e.core.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.ui/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/META-INF/MANIFEST.MF
index 2c8490a4d3a..2c8490a4d3a 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.ui/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/META-INF/MANIFEST.MF
diff --git a/plugins/developer/org.eclipse.papyrus.dev.ui/about.html b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/about.html
index dd3c089a94c..dd3c089a94c 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.ui/about.html
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/about.html
diff --git a/plugins/developer/org.eclipse.papyrus.dev.ui/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/build.properties
index 442a9d0cb2d..442a9d0cb2d 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.ui/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/build.properties
diff --git a/plugins/developer/org.eclipse.papyrus.dev.ui/icons/papyrus/Papyrus_16x16.gif b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/icons/papyrus/Papyrus_16x16.gif
index 8a31f458379..8a31f458379 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.ui/icons/papyrus/Papyrus_16x16.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/icons/papyrus/Papyrus_16x16.gif
diff --git a/plugins/developer/org.eclipse.papyrus.dev.ui/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/plugin.properties
index 3cf88e92752..3cf88e92752 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.ui/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/plugin.properties
diff --git a/plugins/developer/org.eclipse.papyrus.dev.ui/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/plugin.xml
index 3f9ff2ba32a..3f9ff2ba32a 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.ui/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/plugin.xml
diff --git a/plugins/developer/org.eclipse.papyrus.dev.ui/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/pom.xml
index 651214515a9..44c38dfe93d 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.ui/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/pom.xml
@@ -3,8 +3,8 @@
 	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-toolsmiths</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.developer</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<groupId>org.eclipse.papyrus.developer</groupId>
diff --git a/plugins/developer/org.eclipse.papyrus.dev.ui/src/org/eclipse/papyrus/dev/ui/Activator.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/src/org/eclipse/papyrus/dev/ui/Activator.java
index b5b9aaf5148..b5b9aaf5148 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.ui/src/org/eclipse/papyrus/dev/ui/Activator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/src/org/eclipse/papyrus/dev/ui/Activator.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.classpath
index 64c5e31b7a2..64c5e31b7a2 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/.classpath
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.classpath
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/.project b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.project
index 02f08f54531..02f08f54531 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/.project
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.project
diff --git a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.jdt.core.prefs
index c585cc455ae..c585cc455ae 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.pde.api.tools.prefs
index 23fb95e120f..23fb95e120f 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/META-INF/MANIFEST.MF
index 113688fa26b..113688fa26b 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/META-INF/MANIFEST.MF
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/about.html b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/about.html
index dd3c089a94c..dd3c089a94c 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/about.html
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/about.html
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/build.properties
index 48b61a8c93e..48b61a8c93e 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/build.properties
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/icons/serviceeditview.png b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/icons/serviceeditview.png
index 6f5adeb5be2..6f5adeb5be2 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/icons/serviceeditview.png
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/icons/serviceeditview.png
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/plugin.properties
index 0ec8ac374a8..0ec8ac374a8 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/plugin.properties
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/plugin.xml
index 60677e0e602..60677e0e602 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/plugin.xml
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/pom.xml
index 2226c66adce..73a06b3a233 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/pom.xml
@@ -3,7 +3,7 @@
 	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.developer</artifactId>
+    	<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/src/org/eclipse/papyrus/dev/view/services/edit/request/Activator.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/src/org/eclipse/papyrus/dev/view/services/edit/request/Activator.java
index 9d2b0022920..9d2b0022920 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/src/org/eclipse/papyrus/dev/view/services/edit/request/Activator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/src/org/eclipse/papyrus/dev/view/services/edit/request/Activator.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/src/org/eclipse/papyrus/dev/view/services/edit/request/helper/ViewEditHelperAdvice.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/src/org/eclipse/papyrus/dev/view/services/edit/request/helper/ViewEditHelperAdvice.java
index fa4206adf7d..fa4206adf7d 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/src/org/eclipse/papyrus/dev/view/services/edit/request/helper/ViewEditHelperAdvice.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/src/org/eclipse/papyrus/dev/view/services/edit/request/helper/ViewEditHelperAdvice.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/src/org/eclipse/papyrus/dev/view/services/edit/request/messages/Messages.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/src/org/eclipse/papyrus/dev/view/services/edit/request/messages/Messages.java
index ba6547be37e..ba6547be37e 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/src/org/eclipse/papyrus/dev/view/services/edit/request/messages/Messages.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/src/org/eclipse/papyrus/dev/view/services/edit/request/messages/Messages.java
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/src/org/eclipse/papyrus/dev/view/services/edit/request/messages/messages.properties b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/src/org/eclipse/papyrus/dev/view/services/edit/request/messages/messages.properties
index 473dd1acba2..473dd1acba2 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/src/org/eclipse/papyrus/dev/view/services/edit/request/messages/messages.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/src/org/eclipse/papyrus/dev/view/services/edit/request/messages/messages.properties
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/src/org/eclipse/papyrus/dev/view/services/edit/request/view/RequestView.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/src/org/eclipse/papyrus/dev/view/services/edit/request/view/RequestView.java
index 2c181874689..2c181874689 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/src/org/eclipse/papyrus/dev/view/services/edit/request/view/RequestView.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/src/org/eclipse/papyrus/dev/view/services/edit/request/view/RequestView.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.classpath
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.classpath
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.project b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.project
index 665a7936fb9..665a7936fb9 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.project
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.project
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.pde.api.tools.prefs
index 23fb95e120f..23fb95e120f 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF
index f750fa25586..f750fa25586 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/about.html b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/about.html
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/about.html
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/build.properties
index 4d648cc85db..4d648cc85db 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/build.properties
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/icons/Papyrus.gif b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/icons/Papyrus.gif
index 8a31f458379..8a31f458379 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/icons/Papyrus.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/icons/Papyrus.gif
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/plugin.properties
index c05481a74c9..c05481a74c9 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/plugin.properties
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/plugin.xml
index 4699f8f5ff2..4699f8f5ff2 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/plugin.xml
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/pom.xml
index e5188e23336..30a348db6c2 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/pom.xml
@@ -3,7 +3,7 @@
 	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.developer</artifactId>
+    	<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/Activator.java b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/Activator.java
index 0a912eb018a..0a912eb018a 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/Activator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/Activator.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/view/EditPartHierarchyView.java b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/view/EditPartHierarchyView.java
index f7392851cd7..f7392851cd7 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/view/EditPartHierarchyView.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/view/EditPartHierarchyView.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/view/EditPartLabelProvider.java b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/view/EditPartLabelProvider.java
index 934355d7fe4..934355d7fe4 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/view/EditPartLabelProvider.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/view/EditPartLabelProvider.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.classpath
index 64c5e31b7a2..64c5e31b7a2 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/.classpath
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.classpath
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/.project b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.project
index e659a21c41f..e659a21c41f 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/.project
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.project
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.jdt.core.prefs
index c585cc455ae..c585cc455ae 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.pde.api.tools.prefs
index 23fb95e120f..23fb95e120f 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF
index d76704529d8..d76704529d8 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/about.html b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/about.html
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/about.html
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/build.properties
index 4d648cc85db..4d648cc85db 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/build.properties
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/icons/Papyrus.gif b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/icons/Papyrus.gif
index 8a31f458379..8a31f458379 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/icons/Papyrus.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/icons/Papyrus.gif
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/plugin.properties
index 8583b7ca427..8583b7ca427 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/plugin.properties
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/plugin.xml
index 732ca08b653..732ca08b653 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/plugin.xml
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/pom.xml
index 342397954c3..03321bc349c 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/pom.xml
@@ -3,7 +3,7 @@
 	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.developer</artifactId>
+    	<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/src/org/eclipse/papyrus/gmf/editpoliciesstates/Activator.java b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/src/org/eclipse/papyrus/gmf/editpoliciesstates/Activator.java
index 738cf976aad..738cf976aad 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/src/org/eclipse/papyrus/gmf/editpoliciesstates/Activator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/src/org/eclipse/papyrus/gmf/editpoliciesstates/Activator.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/src/org/eclipse/papyrus/gmf/editpoliciesstates/view/EditPoliciesStateView.java b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/src/org/eclipse/papyrus/gmf/editpoliciesstates/view/EditPoliciesStateView.java
index 799bdb33821..799bdb33821 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/src/org/eclipse/papyrus/gmf/editpoliciesstates/view/EditPoliciesStateView.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/src/org/eclipse/papyrus/gmf/editpoliciesstates/view/EditPoliciesStateView.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/src/org/eclipse/papyrus/gmf/editpoliciesstates/view/EditpolicyLabelProvider.java b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/src/org/eclipse/papyrus/gmf/editpoliciesstates/view/EditpolicyLabelProvider.java
index dc618c020a0..dc618c020a0 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/src/org/eclipse/papyrus/gmf/editpoliciesstates/view/EditpolicyLabelProvider.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/src/org/eclipse/papyrus/gmf/editpoliciesstates/view/EditpolicyLabelProvider.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/.classpath
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/.classpath
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/.project b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/.project
index 4a5a5901304..4a5a5901304 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/.project
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/.project
diff --git a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.pde.api.tools.prefs
index 23fb95e120f..23fb95e120f 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF
index d983f3eafcc..d983f3eafcc 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/about.html b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/about.html
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/about.html
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/build.properties
index 59aff5362b8..59aff5362b8 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/build.properties
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/icons/Papyrus.gif b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/icons/Papyrus.gif
index 8a31f458379..8a31f458379 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/icons/Papyrus.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/icons/Papyrus.gif
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/plugin.properties
index a7b24f91fbb..a7b24f91fbb 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/plugin.properties
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/plugin.xml
index acd2bb4f52d..acd2bb4f52d 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/plugin.xml
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/pom.xml
index d8f2a20189c..612776923df 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/pom.xml
@@ -3,7 +3,7 @@
 	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.developer</artifactId>
+    	<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/src/org/eclipse/papyrus/gmf/figureview/Activator.java b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/src/org/eclipse/papyrus/gmf/figureview/Activator.java
index 40c3e93117f..40c3e93117f 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/src/org/eclipse/papyrus/gmf/figureview/Activator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/src/org/eclipse/papyrus/gmf/figureview/Activator.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/src/org/eclipse/papyrus/gmf/figureview/view/FigureHierarchyView.java b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/src/org/eclipse/papyrus/gmf/figureview/view/FigureHierarchyView.java
index 8f7d1dddf52..8f7d1dddf52 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/src/org/eclipse/papyrus/gmf/figureview/view/FigureHierarchyView.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/src/org/eclipse/papyrus/gmf/figureview/view/FigureHierarchyView.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/src/org/eclipse/papyrus/gmf/figureview/view/FigureLabelProvider.java b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/src/org/eclipse/papyrus/gmf/figureview/view/FigureLabelProvider.java
index 6b0b269ef53..6b0b269ef53 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/src/org/eclipse/papyrus/gmf/figureview/view/FigureLabelProvider.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/src/org/eclipse/papyrus/gmf/figureview/view/FigureLabelProvider.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/.classpath
index eca7bdba8f0..eca7bdba8f0 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/.classpath
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/.classpath
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/.project b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/.project
index cd19c4b2ade..cd19c4b2ade 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/.project
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/.project
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.jdt.core.prefs
index 41b887bd50e..41b887bd50e 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.pde.api.tools.prefs
index 23fb95e120f..23fb95e120f 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/META-INF/MANIFEST.MF
index fde22ead007..fde22ead007 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/META-INF/MANIFEST.MF
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/about.html b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/about.html
index 23506a4bae1..23506a4bae1 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/about.html
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/about.html
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/build.properties
index dde0974666b..dde0974666b 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/build.properties
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/icons/GenerateMetamodelType.gif b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/icons/GenerateMetamodelType.gif
index b6831627209..b6831627209 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/icons/GenerateMetamodelType.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/icons/GenerateMetamodelType.gif
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/icons/PapyrusLogo16x16.gif b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/icons/PapyrusLogo16x16.gif
index 8a31f458379..8a31f458379 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/icons/PapyrusLogo16x16.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/icons/PapyrusLogo16x16.gif
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/icons/none_comp_vis.gif b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/icons/none_comp_vis.gif
index a2017d01c82..a2017d01c82 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/icons/none_comp_vis.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/icons/none_comp_vis.gif
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/icons/palette_view.gif b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/icons/palette_view.gif
index 80c152ab6b4..80c152ab6b4 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/icons/palette_view.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/icons/palette_view.gif
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/icons/updateElementType.gif b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/icons/updateElementType.gif
index e3831471a65..e3831471a65 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/icons/updateElementType.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/icons/updateElementType.gif
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/model/gmfgneExtension.uml b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/model/gmfgneExtension.uml
index 3cd33f24df3..3cd33f24df3 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/model/gmfgneExtension.uml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/model/gmfgneExtension.uml
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/model/papyrusGmfgenExtension.ecore b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/model/papyrusGmfgenExtension.ecore
index 7fd23e8fef4..7fd23e8fef4 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/model/papyrusGmfgenExtension.ecore
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/model/papyrusGmfgenExtension.ecore
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/model/papyrusGmfgenExtension.genmodel b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/model/papyrusGmfgenExtension.genmodel
index 570c095dbcf..570c095dbcf 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/model/papyrusGmfgenExtension.genmodel
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/model/papyrusGmfgenExtension.genmodel
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/plugin.properties
index 3cb5c9b9859..3cb5c9b9859 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/plugin.properties
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/plugin.xml
index 62640bd7662..62640bd7662 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/plugin.xml
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/pom.xml
index 58e0743730f..dd626a40851 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/pom.xml
@@ -3,7 +3,7 @@
 	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.developer</artifactId>
+    	<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/AdditionalEditPartCandies.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/AdditionalEditPartCandies.java
index fa5610e385a..fa5610e385a 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/AdditionalEditPartCandies.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/AdditionalEditPartCandies.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/AlternateCanvas.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/AlternateCanvas.java
index 0a981c98c32..0a981c98c32 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/AlternateCanvas.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/AlternateCanvas.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/AlternateGenLink.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/AlternateGenLink.java
index 3288cdddf01..3288cdddf01 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/AlternateGenLink.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/AlternateGenLink.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/AlternateGenTopLevelNode.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/AlternateGenTopLevelNode.java
index d45bf2f8e3c..d45bf2f8e3c 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/AlternateGenTopLevelNode.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/AlternateGenTopLevelNode.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/CommentedElement.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/CommentedElement.java
index bf417e51bc3..bf417e51bc3 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/CommentedElement.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/CommentedElement.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/CompartmentTitleVisibilityPreference.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/CompartmentTitleVisibilityPreference.java
index 46501b29817..46501b29817 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/CompartmentTitleVisibilityPreference.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/CompartmentTitleVisibilityPreference.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/CompartmentVisibilityPreference.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/CompartmentVisibilityPreference.java
index 4b5fafff2a7..4b5fafff2a7 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/CompartmentVisibilityPreference.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/CompartmentVisibilityPreference.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/ConstrainedByReferenceCompartmentItemSemanticEditPolicy.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/ConstrainedByReferenceCompartmentItemSemanticEditPolicy.java
index b4f402dfe28..b4f402dfe28 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/ConstrainedByReferenceCompartmentItemSemanticEditPolicy.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/ConstrainedByReferenceCompartmentItemSemanticEditPolicy.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/CustomDiagramUpdaterSingleton.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/CustomDiagramUpdaterSingleton.java
index da501b32c22..da501b32c22 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/CustomDiagramUpdaterSingleton.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/CustomDiagramUpdaterSingleton.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/EditPartUsingDeleteService.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/EditPartUsingDeleteService.java
index 1c92dd1f4aa..1c92dd1f4aa 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/EditPartUsingDeleteService.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/EditPartUsingDeleteService.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/EditPartUsingReorientService.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/EditPartUsingReorientService.java
index 12de25dc4f7..12de25dc4f7 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/EditPartUsingReorientService.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/EditPartUsingReorientService.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/ExtendedGenView.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/ExtendedGenView.java
index 77fdbb7bb74..77fdbb7bb74 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/ExtendedGenView.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/ExtendedGenView.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/ExternalHook.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/ExternalHook.java
index f88baabdf90..f88baabdf90 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/ExternalHook.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/ExternalHook.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/GenNodeConstraint.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/GenNodeConstraint.java
index cd5ff3d4838..cd5ff3d4838 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/GenNodeConstraint.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/GenNodeConstraint.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/GenVisualTypeProvider.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/GenVisualTypeProvider.java
index 4c8872760a4..4c8872760a4 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/GenVisualTypeProvider.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/GenVisualTypeProvider.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/GenerateUsingElementTypeCreationCommand.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/GenerateUsingElementTypeCreationCommand.java
index d2d26579bde..d2d26579bde 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/GenerateUsingElementTypeCreationCommand.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/GenerateUsingElementTypeCreationCommand.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/LabelVisibilityPreference.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/LabelVisibilityPreference.java
index 17400de80c1..17400de80c1 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/LabelVisibilityPreference.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/LabelVisibilityPreference.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/MutatingCanvas.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/MutatingCanvas.java
index 5a358d280ad..5a358d280ad 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/MutatingCanvas.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/MutatingCanvas.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/OwnedEditpart.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/OwnedEditpart.java
index dcfed56b322..dcfed56b322 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/OwnedEditpart.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/OwnedEditpart.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/PapyrusExtensionRootNode.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/PapyrusExtensionRootNode.java
index a3d3d69eba5..a3d3d69eba5 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/PapyrusExtensionRootNode.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/PapyrusExtensionRootNode.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/PapyrusgmfgenextensionFactory.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/PapyrusgmfgenextensionFactory.java
index b445fec8f53..b445fec8f53 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/PapyrusgmfgenextensionFactory.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/PapyrusgmfgenextensionFactory.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/PapyrusgmfgenextensionPackage.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/PapyrusgmfgenextensionPackage.java
index cb170ece28e..cb170ece28e 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/PapyrusgmfgenextensionPackage.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/PapyrusgmfgenextensionPackage.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/PropertyRefreshHook.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/PropertyRefreshHook.java
index f6941ddbb7a..f6941ddbb7a 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/PropertyRefreshHook.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/PropertyRefreshHook.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/SpecificDiagramUpdater.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/SpecificDiagramUpdater.java
index ef4577c90c3..ef4577c90c3 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/SpecificDiagramUpdater.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/SpecificDiagramUpdater.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/SpecificLocator.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/SpecificLocator.java
index 8b861108f3d..8b861108f3d 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/SpecificLocator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/SpecificLocator.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/SpecificLocatorExternalLabel.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/SpecificLocatorExternalLabel.java
index 784ea0d51f5..784ea0d51f5 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/SpecificLocatorExternalLabel.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/SpecificLocatorExternalLabel.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/SpecificNodePlate.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/SpecificNodePlate.java
index 75036932973..75036932973 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/SpecificNodePlate.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/SpecificNodePlate.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/VisualIDOverride.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/VisualIDOverride.java
index 9bb861d0970..9bb861d0970 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/VisualIDOverride.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/VisualIDOverride.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/AdditionalEditPartCandiesImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/AdditionalEditPartCandiesImpl.java
index a35a95963b6..a35a95963b6 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/AdditionalEditPartCandiesImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/AdditionalEditPartCandiesImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/AlternateCanvasImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/AlternateCanvasImpl.java
index ac658947328..ac658947328 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/AlternateCanvasImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/AlternateCanvasImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/AlternateGenLinkImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/AlternateGenLinkImpl.java
index ad482930f08..ad482930f08 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/AlternateGenLinkImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/AlternateGenLinkImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/AlternateGenTopLevelNodeImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/AlternateGenTopLevelNodeImpl.java
index 4bcf080d011..4bcf080d011 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/AlternateGenTopLevelNodeImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/AlternateGenTopLevelNodeImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/CommentedElementImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/CommentedElementImpl.java
index ed05be024b1..ed05be024b1 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/CommentedElementImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/CommentedElementImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/CompartmentTitleVisibilityPreferenceImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/CompartmentTitleVisibilityPreferenceImpl.java
index 4c5fb414537..4c5fb414537 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/CompartmentTitleVisibilityPreferenceImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/CompartmentTitleVisibilityPreferenceImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/CompartmentVisibilityPreferenceImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/CompartmentVisibilityPreferenceImpl.java
index 43d344b69f2..43d344b69f2 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/CompartmentVisibilityPreferenceImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/CompartmentVisibilityPreferenceImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/ConstrainedByReferenceCompartmentItemSemanticEditPolicyImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/ConstrainedByReferenceCompartmentItemSemanticEditPolicyImpl.java
index 5dcb4368ef1..5dcb4368ef1 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/ConstrainedByReferenceCompartmentItemSemanticEditPolicyImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/ConstrainedByReferenceCompartmentItemSemanticEditPolicyImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/CustomDiagramUpdaterSingletonImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/CustomDiagramUpdaterSingletonImpl.java
index 390b7ff2be3..390b7ff2be3 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/CustomDiagramUpdaterSingletonImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/CustomDiagramUpdaterSingletonImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/EditPartUsingDeleteServiceImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/EditPartUsingDeleteServiceImpl.java
index 6f6b056b2e4..6f6b056b2e4 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/EditPartUsingDeleteServiceImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/EditPartUsingDeleteServiceImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/EditPartUsingReorientServiceImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/EditPartUsingReorientServiceImpl.java
index 057e9660732..057e9660732 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/EditPartUsingReorientServiceImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/EditPartUsingReorientServiceImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/ExtendedGenViewImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/ExtendedGenViewImpl.java
index 8f0ce357522..8f0ce357522 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/ExtendedGenViewImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/ExtendedGenViewImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/ExternalHookImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/ExternalHookImpl.java
index 51163c88baf..51163c88baf 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/ExternalHookImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/ExternalHookImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/GenNodeConstraintImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/GenNodeConstraintImpl.java
index b18bb7d0ca1..b18bb7d0ca1 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/GenNodeConstraintImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/GenNodeConstraintImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/GenVisualTypeProviderImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/GenVisualTypeProviderImpl.java
index af33d05846d..af33d05846d 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/GenVisualTypeProviderImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/GenVisualTypeProviderImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/GenerateUsingElementTypeCreationCommandImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/GenerateUsingElementTypeCreationCommandImpl.java
index a565cc690a5..a565cc690a5 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/GenerateUsingElementTypeCreationCommandImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/GenerateUsingElementTypeCreationCommandImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/LabelVisibilityPreferenceImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/LabelVisibilityPreferenceImpl.java
index 33348d4cf74..33348d4cf74 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/LabelVisibilityPreferenceImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/LabelVisibilityPreferenceImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/MutatingCanvasImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/MutatingCanvasImpl.java
index 218b29bc099..218b29bc099 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/MutatingCanvasImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/MutatingCanvasImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/OwnedEditpartImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/OwnedEditpartImpl.java
index 3e7059f2549..3e7059f2549 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/OwnedEditpartImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/OwnedEditpartImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/PapyrusExtensionRootNodeImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/PapyrusExtensionRootNodeImpl.java
index f3a3d59c213..f3a3d59c213 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/PapyrusExtensionRootNodeImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/PapyrusExtensionRootNodeImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/PapyrusgmfgenextensionFactoryImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/PapyrusgmfgenextensionFactoryImpl.java
index 6914d2e9656..6914d2e9656 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/PapyrusgmfgenextensionFactoryImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/PapyrusgmfgenextensionFactoryImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/PapyrusgmfgenextensionPackageImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/PapyrusgmfgenextensionPackageImpl.java
index 98efe88406f..98efe88406f 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/PapyrusgmfgenextensionPackageImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/PapyrusgmfgenextensionPackageImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/PropertyRefreshHookImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/PropertyRefreshHookImpl.java
index 61bc308c113..61bc308c113 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/PropertyRefreshHookImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/PropertyRefreshHookImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/SpecificDiagramUpdaterImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/SpecificDiagramUpdaterImpl.java
index c8a9abd3f42..c8a9abd3f42 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/SpecificDiagramUpdaterImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/SpecificDiagramUpdaterImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/SpecificLocatorExternalLabelImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/SpecificLocatorExternalLabelImpl.java
index 4748763ce1c..4748763ce1c 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/SpecificLocatorExternalLabelImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/SpecificLocatorExternalLabelImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/SpecificLocatorImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/SpecificLocatorImpl.java
index 2e7c3fc0a2b..2e7c3fc0a2b 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/SpecificLocatorImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/SpecificLocatorImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/SpecificNodePlateImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/SpecificNodePlateImpl.java
index c91c2c9fe79..c91c2c9fe79 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/SpecificNodePlateImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/SpecificNodePlateImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/VisualIDOverrideImpl.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/VisualIDOverrideImpl.java
index eeba2d14251..eeba2d14251 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/VisualIDOverrideImpl.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/impl/VisualIDOverrideImpl.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/Action.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/Action.java
index a1f61672012..a1f61672012 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/Action.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/Action.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddDefaultNamedElementAction.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddDefaultNamedElementAction.java
index 7fdf95b7fc8..7fdf95b7fc8 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddDefaultNamedElementAction.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddDefaultNamedElementAction.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddExternalNodeFloatingLabelDisplayBehavior.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddExternalNodeFloatingLabelDisplayBehavior.java
index 6e452dac1aa..6e452dac1aa 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddExternalNodeFloatingLabelDisplayBehavior.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddExternalNodeFloatingLabelDisplayBehavior.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddExternalNodeStereotypeDisplayBehavior.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddExternalNodeStereotypeDisplayBehavior.java
index fc564a851d1..fc564a851d1 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddExternalNodeStereotypeDisplayBehavior.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddExternalNodeStereotypeDisplayBehavior.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddGenLinkStereotypeDisplayBehavior.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddGenLinkStereotypeDisplayBehavior.java
index a9686b7ee92..a9686b7ee92 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddGenLinkStereotypeDisplayBehavior.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddGenLinkStereotypeDisplayBehavior.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddHyperLinkPopupBarBehavior.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddHyperLinkPopupBarBehavior.java
index f84369334fc..f84369334fc 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddHyperLinkPopupBarBehavior.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddHyperLinkPopupBarBehavior.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeQualifiedNameBehavior.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeQualifiedNameBehavior.java
index ceb4fa061ec..ceb4fa061ec 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeQualifiedNameBehavior.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeQualifiedNameBehavior.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideCompartmentBehavior.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideCompartmentBehavior.java
index 45273d28247..45273d28247 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideCompartmentBehavior.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideCompartmentBehavior.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideContentsBehavior.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideContentsBehavior.java
index aa653e44c77..aa653e44c77 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideContentsBehavior.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideContentsBehavior.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideLabelsBehavior.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideLabelsBehavior.java
index 787f680138e..787f680138e 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideLabelsBehavior.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideLabelsBehavior.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeStereotypeDisplayBehavior.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeStereotypeDisplayBehavior.java
index baa083e666f..baa083e666f 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeStereotypeDisplayBehavior.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeStereotypeDisplayBehavior.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddOrUpdateCommentEditParts.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddOrUpdateCommentEditParts.java
index ba9b1d9b52f..ba9b1d9b52f 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddOrUpdateCommentEditParts.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddOrUpdateCommentEditParts.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddSemanticElementTypeInGenericTopNode.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddSemanticElementTypeInGenericTopNode.java
index 207ee07740e..207ee07740e 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddSemanticElementTypeInGenericTopNode.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddSemanticElementTypeInGenericTopNode.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddShapeNamedElementAction.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddShapeNamedElementAction.java
index e861db22341..e861db22341 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddShapeNamedElementAction.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddShapeNamedElementAction.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddSmallAndLargeIconForPaletteAction.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddSmallAndLargeIconForPaletteAction.java
index f5d585ef909..f5d585ef909 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddSmallAndLargeIconForPaletteAction.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddSmallAndLargeIconForPaletteAction.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/DisplayReport.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/DisplayReport.java
index 8808bfe9e46..8808bfe9e46 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/DisplayReport.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/DisplayReport.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/EditpartGenHelper.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/EditpartGenHelper.java
index 2728dc3f826..2728dc3f826 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/EditpartGenHelper.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/EditpartGenHelper.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/Messages.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/Messages.java
index 38ac7b07234..38ac7b07234 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/Messages.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/Messages.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/SetCompartmentNeedsTitleToTrueAction.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/SetCompartmentNeedsTitleToTrueAction.java
index 7f23d4804d9..7f23d4804d9 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/SetCompartmentNeedsTitleToTrueAction.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/SetCompartmentNeedsTitleToTrueAction.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/SetVisualIDWithUnusedValue.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/SetVisualIDWithUnusedValue.java
index 35d19c78d6e..35d19c78d6e 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/SetVisualIDWithUnusedValue.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/SetVisualIDWithUnusedValue.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/TestCodeSetGeneration.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/TestCodeSetGeneration.java
index 2776e4ab8c5..2776e4ab8c5 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/TestCodeSetGeneration.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/TestCodeSetGeneration.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/UpdateElementTypeToMatchGenericType.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/UpdateElementTypeToMatchGenericType.java
index d9e170257dd..d9e170257dd 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/UpdateElementTypeToMatchGenericType.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/UpdateElementTypeToMatchGenericType.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/messages.properties b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/messages.properties
index 500f4e5ba6e..500f4e5ba6e 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/messages.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/messages.properties
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/util/PapyrusgmfgenextensionAdapterFactory.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/util/PapyrusgmfgenextensionAdapterFactory.java
index c19da89c376..c19da89c376 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/util/PapyrusgmfgenextensionAdapterFactory.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/util/PapyrusgmfgenextensionAdapterFactory.java
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/util/PapyrusgmfgenextensionSwitch.java b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/util/PapyrusgmfgenextensionSwitch.java
index a3423962801..a3423962801 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/util/PapyrusgmfgenextensionSwitch.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/util/PapyrusgmfgenextensionSwitch.java
diff --git a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.classpath
index eca7bdba8f0..eca7bdba8f0 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.classpath
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.classpath
diff --git a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.project b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.project
index 6ddb42c193b..6ddb42c193b 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.project
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.project
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.jdt.core.prefs
index b3aa6d60f94..b3aa6d60f94 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.pde.api.tools.prefs
index 23fb95e120f..23fb95e120f 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/META-INF/MANIFEST.MF
index a348f5c5320..a348f5c5320 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/META-INF/MANIFEST.MF
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/about.html b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/about.html
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/about.html
diff --git a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/build.properties
index 69d0f2e3ef2..69d0f2e3ef2 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/build.properties
diff --git a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/icons/stack.gif b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/icons/stack.gif
index 3d49e781ea1..3d49e781ea1 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/icons/stack.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/icons/stack.gif
diff --git a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/plugin.properties
index ccae23170cd..ccae23170cd 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/plugin.properties
diff --git a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/plugin.xml
index b31f2ce7572..b31f2ce7572 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/plugin.xml
diff --git a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/pom.xml
index 1c9797f716c..b3e27024d21 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/pom.xml
@@ -3,7 +3,7 @@
 	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.developer</artifactId>
+		<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
diff --git a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/src/org/eclipse/papyrus/infra/emf/commandstack/Activator.java b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/src/org/eclipse/papyrus/infra/emf/commandstack/Activator.java
index 309d259bfd6..309d259bfd6 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/src/org/eclipse/papyrus/infra/emf/commandstack/Activator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/src/org/eclipse/papyrus/infra/emf/commandstack/Activator.java
diff --git a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/src/org/eclipse/papyrus/infra/emf/commandstack/view/CommandStackView.java b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/src/org/eclipse/papyrus/infra/emf/commandstack/view/CommandStackView.java
index da126f1fda0..da126f1fda0 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/src/org/eclipse/papyrus/infra/emf/commandstack/view/CommandStackView.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/src/org/eclipse/papyrus/infra/emf/commandstack/view/CommandStackView.java
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.classpath
index 098194ca4b7..098194ca4b7 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.classpath
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.classpath
diff --git a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/.project b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.project
index 6d0a2d6afca..6d0a2d6afca 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/.project
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.project
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c4..f08be2b06c4 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.pde.api.tools.prefs
index 23fb95e120f..23fb95e120f 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF
index 55ad76f7937..55ad76f7937 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF
diff --git a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/OSGI-INF/l10n/bundle.properties b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/OSGI-INF/l10n/bundle.properties
index 45447c9f1f3..45447c9f1f3 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/OSGI-INF/l10n/bundle.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/OSGI-INF/l10n/bundle.properties
diff --git a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/about.html b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/about.html
index dd3c089a94c..dd3c089a94c 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/about.html
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/about.html
diff --git a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/build.properties
index 402fb15dc13..402fb15dc13 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/build.properties
diff --git a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/icons/sourceEditor.gif b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/icons/sourceEditor.gif
index 75ebdb85865..75ebdb85865 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/icons/sourceEditor.gif
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/icons/sourceEditor.gif
diff --git a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/plugin.xml
index a918e874e12..a918e874e12 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/plugin.xml
diff --git a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/pom.xml
index a8d498d7449..5fc90f11c84 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/pom.xml
@@ -3,7 +3,7 @@
 	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.developer</artifactId>
+		<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
diff --git a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/src/org/eclipse/papyrus/infra/gmfdiag/css/debug/Activator.java b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/src/org/eclipse/papyrus/infra/gmfdiag/css/debug/Activator.java
index a07e324e702..a07e324e702 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/src/org/eclipse/papyrus/infra/gmfdiag/css/debug/Activator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/src/org/eclipse/papyrus/infra/gmfdiag/css/debug/Activator.java
diff --git a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/src/org/eclipse/papyrus/infra/gmfdiag/css/debug/views/CSSDebugView.java b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/src/org/eclipse/papyrus/infra/gmfdiag/css/debug/views/CSSDebugView.java
index 03b692057b7..03b692057b7 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/src/org/eclipse/papyrus/infra/gmfdiag/css/debug/views/CSSDebugView.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/src/org/eclipse/papyrus/infra/gmfdiag/css/debug/views/CSSDebugView.java
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/.classpath
index 7f2da634a03..7f2da634a03 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/.classpath
+++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/.classpath
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/.project b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/.project
index c5290b1e383..c5290b1e383 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/.project
+++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/.project
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.jdt.core.prefs
index 94d61f00da6..94d61f00da6 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.pde.api.tools.prefs
index 23fb95e120f..23fb95e120f 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF
index fafc5ffb11d..fafc5ffb11d 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/OSGI-INF/l10n/bundle.properties b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/OSGI-INF/l10n/bundle.properties
index 4d968d49df4..4d968d49df4 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/OSGI-INF/l10n/bundle.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/OSGI-INF/l10n/bundle.properties
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/about.html b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/about.html
+++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/about.html
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/build.properties
index 9fa0925a369..9fa0925a369 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/build.properties
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/pom.xml
index 5bc6d980e82..fbbfcb3b0b2 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/pom.xml
@@ -3,7 +3,7 @@
 	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.developer</artifactId>
+		<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/Activator.java b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/Activator.java
index da4e0add9ab..da4e0add9ab 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/Activator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/Activator.java
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/XtendWorkflow.java b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/XtendWorkflow.java
index 66276e05b71..66276e05b71 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/XtendWorkflow.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/XtendWorkflow.java
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/components/MultiReader.java b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/components/MultiReader.java
index 5f16d9dead2..5f16d9dead2 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/components/MultiReader.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/components/MultiReader.java
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/components/QvtoTransformationWorkflow.java b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/components/QvtoTransformationWorkflow.java
index a7b329fea48..a7b329fea48 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/components/QvtoTransformationWorkflow.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/components/QvtoTransformationWorkflow.java
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/components/RegisterUmlProfile.java b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/components/RegisterUmlProfile.java
index fd12dfb411b..fd12dfb411b 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/components/RegisterUmlProfile.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/components/RegisterUmlProfile.java
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/components/UMLWriter.java b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/components/UMLWriter.java
index 3e61bc2a902..3e61bc2a902 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/components/UMLWriter.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/components/UMLWriter.java
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/messages/Messages.java b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/messages/Messages.java
index 7887428b52d..7887428b52d 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/messages/Messages.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/messages/Messages.java
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/messages/messages.properties b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/messages/messages.properties
index f5a2d43d52b..f5a2d43d52b 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/messages/messages.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/messages/messages.properties
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/xtend-gen/.gitignore b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/xtend-gen/.gitignore
index d6b7ef32c84..d6b7ef32c84 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/xtend-gen/.gitignore
+++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/xtend-gen/.gitignore
diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/.classpath
index 075009d7745..075009d7745 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.dev.release/.classpath
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/.classpath
diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/.project b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/.project
index 98d20bdbba9..98d20bdbba9 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.dev.release/.project
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/.project
diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/META-INF/MANIFEST.MF
index b4abef47e34..b4abef47e34 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.dev.release/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/META-INF/MANIFEST.MF
diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/OSGI-INF/l10n/bundle.properties b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/OSGI-INF/l10n/bundle.properties
index ae3c2cce87d..ae3c2cce87d 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.dev.release/OSGI-INF/l10n/bundle.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/OSGI-INF/l10n/bundle.properties
diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/about.html b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/about.html
index 42595040e90..42595040e90 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.dev.release/about.html
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/about.html
diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/build.properties
index 108325c83cb..108325c83cb 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.dev.release/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/build.properties
diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/pom.xml
index 3bc6d781eac..dca4b50a4a6 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.dev.release/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/pom.xml
@@ -3,7 +3,7 @@
 	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.developer</artifactId>
+		<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.digest b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/release.digest
index ba1d0982219..ba1d0982219 100755
--- a/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.digest
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/release.digest
diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.properties b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/release.properties
index f92503e5a9a..f92503e5a9a 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/release.properties
diff --git a/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.xml b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/release.xml
index 4b7f33948f1..4b7f33948f1 100755
--- a/plugins/developer/org.eclipse.papyrus.releng.dev.release/release.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/release.xml
diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/.classpath
index 075009d7745..075009d7745 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.main.release/.classpath
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/.classpath
diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/.project b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/.project
index 7184f995779..7184f995779 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.main.release/.project
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/.project
diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/META-INF/MANIFEST.MF
index 85e040c1a92..85e040c1a92 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.main.release/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/META-INF/MANIFEST.MF
diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/OSGI-INF/l10n/bundle.properties b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/OSGI-INF/l10n/bundle.properties
index ae3c2cce87d..ae3c2cce87d 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.main.release/OSGI-INF/l10n/bundle.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/OSGI-INF/l10n/bundle.properties
diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/about.html b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/about.html
index 42595040e90..42595040e90 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.main.release/about.html
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/about.html
diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/build.properties
index 108325c83cb..108325c83cb 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.main.release/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/build.properties
diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/pom.xml
index b289a4ea156..e7fdddb1926 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.main.release/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/pom.xml
@@ -3,7 +3,7 @@
 	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.developer</artifactId>
+		<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/release.digest b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/release.digest
index 43cca91a75a..43cca91a75a 100755
--- a/plugins/developer/org.eclipse.papyrus.releng.main.release/release.digest
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/release.digest
diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/release.properties b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/release.properties
index 6386955392d..6386955392d 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.main.release/release.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/release.properties
diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/release.xml b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/release.xml
index 47bb90d9013..47bb90d9013 100755
--- a/plugins/developer/org.eclipse.papyrus.releng.main.release/release.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/release.xml
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/.classpath
index eca7bdba8f0..eca7bdba8f0 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/.classpath
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/.classpath
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/.project b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/.project
index 3cff99c9bf9..3cff99c9bf9 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/.project
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/.project
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.jdt.core.prefs
index b3aa6d60f94..b3aa6d60f94 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.pde.api.tools.prefs
index 23fb95e120f..23fb95e120f 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
index fc2a2c2c647..fc2a2c2c647 100755
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/OSGI-INF/l10n/bundle.properties b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/OSGI-INF/l10n/bundle.properties
index ac162d244de..ac162d244de 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/OSGI-INF/l10n/bundle.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/OSGI-INF/l10n/bundle.properties
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/README.TXT b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/README.TXT
index 502229bb09f..502229bb09f 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/README.TXT
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/README.TXT
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/about.html b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/about.html
index 42595040e90..42595040e90 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/about.html
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/about.html
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/build.properties
index 42571d6d439..42571d6d439 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/build.properties
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/plugin.xml
index b6be9b31d4d..b6be9b31d4d 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/plugin.xml
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/pom.xml
index 6d4d06ecdfb..a4ea710f78a 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/pom.xml
@@ -3,7 +3,7 @@
 	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.developer</artifactId>
+		<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/Activator.java b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/Activator.java
index 9e14a6b2fea..9e14a6b2fea 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/Activator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/Activator.java
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/Messages.java b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/Messages.java
index 8d75c212858..8d75c212858 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/Messages.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/Messages.java
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/AddSetupRepositoryUpdateAnnotationHandler.java b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/AddSetupRepositoryUpdateAnnotationHandler.java
index 54f5c963804..54f5c963804 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/AddSetupRepositoryUpdateAnnotationHandler.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/AddSetupRepositoryUpdateAnnotationHandler.java
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/UpdateDependenciesHandler.java b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/UpdateDependenciesHandler.java
index ddec2c33d3a..ddec2c33d3a 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/UpdateDependenciesHandler.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/UpdateDependenciesHandler.java
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/messages.properties b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/messages.properties
index 8708cdc00ed..8708cdc00ed 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/messages.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/messages.properties
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/DependencyUpdater.java b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/DependencyUpdater.java
index a2e3e1c5478..a2e3e1c5478 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/DependencyUpdater.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/DependencyUpdater.java
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/GenerateTargetsHandler.java b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/GenerateTargetsHandler.java
index 28e9e42356e..28e9e42356e 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/GenerateTargetsHandler.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/GenerateTargetsHandler.java
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/MapUpdater.java b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/MapUpdater.java
index e0e6fdd32d1..e0e6fdd32d1 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/MapUpdater.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/MapUpdater.java
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/OomphSetupUpdater.java b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/OomphSetupUpdater.java
index 8794a4295f9..8794a4295f9 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/OomphSetupUpdater.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/OomphSetupUpdater.java
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/PomPropertiesUpdater.java b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/PomPropertiesUpdater.java
index 7047619026f..7047619026f 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/PomPropertiesUpdater.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/PomPropertiesUpdater.java
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/PomUpdater.java b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/PomUpdater.java
index 4bb3a38dc34..4bb3a38dc34 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/PomUpdater.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/PomUpdater.java
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/TPDUpdater.java b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/TPDUpdater.java
index 496c62ebd5f..496c62ebd5f 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/TPDUpdater.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/TPDUpdater.java
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/UpdateDependencies.java b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/UpdateDependencies.java
index 9523c6f75eb..9523c6f75eb 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/UpdateDependencies.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/UpdateDependencies.java
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/XMLDependencyUpdater.java b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/XMLDependencyUpdater.java
index 873299151d2..873299151d2 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/XMLDependencyUpdater.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/XMLDependencyUpdater.java
diff --git a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.classpath
index eca7bdba8f0..eca7bdba8f0 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.classpath
+++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.classpath
diff --git a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.gitignore b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.gitignore
index ae3c1726048..ae3c1726048 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.gitignore
+++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.gitignore
diff --git a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.project b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.project
index 1b37c2cac47..1b37c2cac47 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.project
+++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.project
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.jdt.core.prefs
index b3aa6d60f94..b3aa6d60f94 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.pde.api.tools.prefs
index 23fb95e120f..23fb95e120f 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/META-INF/MANIFEST.MF
index 5071a4d2acf..5071a4d2acf 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/META-INF/MANIFEST.MF
diff --git a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/OSGI-INF/l10n/bundle.properties b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/OSGI-INF/l10n/bundle.properties
index 9f304ccecb3..9f304ccecb3 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/OSGI-INF/l10n/bundle.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/OSGI-INF/l10n/bundle.properties
diff --git a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/about.html b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/about.html
index dd3c089a94c..dd3c089a94c 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/about.html
+++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/about.html
diff --git a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/build.properties
index 134d84c12c6..134d84c12c6 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/build.properties
diff --git a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/pom.xml
index 2e728b79258..b980b71640e 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.papyrus</groupId>
-    <artifactId>org.eclipse.papyrus.developer</artifactId>
+    <artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
diff --git a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/src/org/eclipse/papyrus/uml/m2m/qvto/tests/tools/Activator.java b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/src/org/eclipse/papyrus/uml/m2m/qvto/tests/tools/Activator.java
index c6cfafa89a2..c6cfafa89a2 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/src/org/eclipse/papyrus/uml/m2m/qvto/tests/tools/Activator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/src/org/eclipse/papyrus/uml/m2m/qvto/tests/tools/Activator.java
diff --git a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/src/org/eclipse/papyrus/uml/m2m/qvto/tests/tools/tests/AbstractImportModelTests.java b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/src/org/eclipse/papyrus/uml/m2m/qvto/tests/tools/tests/AbstractImportModelTests.java
index e7cb9f51aba..e7cb9f51aba 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/src/org/eclipse/papyrus/uml/m2m/qvto/tests/tools/tests/AbstractImportModelTests.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/src/org/eclipse/papyrus/uml/m2m/qvto/tests/tools/tests/AbstractImportModelTests.java
diff --git a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/src/org/eclipse/papyrus/uml/m2m/qvto/tests/tools/tests/EMFCompareUtils.java b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/src/org/eclipse/papyrus/uml/m2m/qvto/tests/tools/tests/EMFCompareUtils.java
index cd701682f0c..cd701682f0c 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/src/org/eclipse/papyrus/uml/m2m/qvto/tests/tools/tests/EMFCompareUtils.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/src/org/eclipse/papyrus/uml/m2m/qvto/tests/tools/tests/EMFCompareUtils.java
diff --git a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/src/org/eclipse/papyrus/uml/m2m/qvto/tests/tools/tests/PapyrusProximityEObjectMatcher.java b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/src/org/eclipse/papyrus/uml/m2m/qvto/tests/tools/tests/PapyrusProximityEObjectMatcher.java
index 137c1961070..137c1961070 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/src/org/eclipse/papyrus/uml/m2m/qvto/tests/tools/tests/PapyrusProximityEObjectMatcher.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/src/org/eclipse/papyrus/uml/m2m/qvto/tests/tools/tests/PapyrusProximityEObjectMatcher.java
diff --git a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/src/org/eclipse/papyrus/uml/m2m/qvto/tests/tools/tests/UMLIgnoringIdentifiedEqualityHelper.java b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/src/org/eclipse/papyrus/uml/m2m/qvto/tests/tools/tests/UMLIgnoringIdentifiedEqualityHelper.java
index 79fbf82fb1c..79fbf82fb1c 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/src/org/eclipse/papyrus/uml/m2m/qvto/tests/tools/tests/UMLIgnoringIdentifiedEqualityHelper.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/src/org/eclipse/papyrus/uml/m2m/qvto/tests/tools/tests/UMLIgnoringIdentifiedEqualityHelper.java
diff --git a/plugins/toolsmiths/pom.xml b/plugins/toolsmiths/pom.xml
index 7f9d2622af0..59d4bffe7b7 100644
--- a/plugins/toolsmiths/pom.xml
+++ b/plugins/toolsmiths/pom.xml
@@ -4,18 +4,40 @@
 	<modelVersion>4.0.0</modelVersion>
 	
 	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.plugins</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
+		<artifactId>org.eclipse.papyrus.toolsmiths.releng</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../../releng/toolsmiths/pom.xml</relativePath>
     </parent>
     <artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 	<name>Papyrus Toolsmiths Plugins</name>
-	<description>Tools for Papyrus DSML ToolSmiths, including UI customization model editors.</description>
+	<description>Tools for Papyrus DSML ToolSmiths, including UI customization model editors and 
+		providing aids for debugging, releng, and other development tasks.</description>
 
 	<modules>
 		<module>org.eclipse.papyrus.toolsmiths</module>
 		<module>org.eclipse.papyrus.toolsmiths.palette</module>
 		<module>org.eclipse.papyrus.toolsmiths.expressions</module>
+		
+		<module>assistants</module>
+		<module>org.eclipse.papyrus.codegen</module>
+		<module>org.eclipse.papyrus.def</module>
+		<module>org.eclipse.papyrus.dev.assistants.codegen</module>
+		<module>org.eclipse.papyrus.dev.pluginexplorer</module>
+		<module>org.eclipse.papyrus.dev.project.management</module>
+		<module>org.eclipse.papyrus.dev.types</module>
+		<module>org.eclipse.papyrus.dev.ui</module>
+		<module>org.eclipse.papyrus.dev.view.services.edit.request</module>
+		<module>org.eclipse.papyrus.gmf.editpartview</module>
+		<module>org.eclipse.papyrus.gmf.editpoliciesstates</module>
+		<module>org.eclipse.papyrus.gmf.figureview</module>
+		<module>org.eclipse.papyrus.gmfgenextension</module>
+		<module>org.eclipse.papyrus.infra.emf.commandstack</module>
+		<module>org.eclipse.papyrus.infra.gmfdiag.css.debug</module>
+		<module>org.eclipse.papyrus.mwe2.utils</module>
+		<module>org.eclipse.papyrus.releng.tools</module>
+		<module>org.eclipse.papyrus.uml.m2m.qvto.tests.tools</module>
 	</modules>
 </project>
diff --git a/plugins/uml/newchild/pom.xml b/plugins/uml/newchild/pom.xml
deleted file mode 100644
index afa50b7f6d1..00000000000
--- a/plugins/uml/newchild/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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-newchild</artifactId>
-	<packaging>pom</packaging>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-    </parent>
-	<name>Papyrus UML New Child Menu</name>
-	<description>Plug-ins comprising and support the "New Child" context menu for UML models.</description>
-
-	<modules>
-		<module>org.eclipse.papyrus.uml.profile.newchildmenu.generator</module>
-		<module>org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui</module>
-	</modules>
-</project>
diff --git a/plugins/uml/pom.xml b/plugins/uml/pom.xml
index 6693d9d9fdd..cb6a35cdc52 100644
--- a/plugins/uml/pom.xml
+++ b/plugins/uml/pom.xml
@@ -39,13 +39,11 @@
 		<module>org.eclipse.papyrus.uml.ui</module>
 		<module>alf</module>
 		<module>architecture</module>
-		<module>assistants</module>
 		<module>decoratormodel</module>
 		<module>diagram</module>
 		<module>expressions</module>
 		<module>modelexplorer</module>
 		<module>nattable</module>
-		<module>newchild</module>
 		<module>profile</module>
 		<module>properties</module>
 		<module>textedit</module>