diff --git a/README.md b/README.md
new file mode 100644
index 0000000..8ca1911
--- /dev/null
+++ b/README.md
@@ -0,0 +1,35 @@
+To build annotations
+====================
+> mvn clean verify -P simex,annotations
+
+To build externalcontrol
+========================
+> mvn clean verify -P externalcontrol
+
+To build fmi
+=============
+> mvn clean verify -P fmi
+
+To build instancespecification
+==============================
+> mvn clean verify -P instancespecification
+
+To build parametric
+===================
+> mvn clean verify -P parametric
+
+To build scripting
+==================
+> mvn clean verify -P scripting
+
+To build simex
+==============
+> mvn clean verify -P simex
+
+To build suml
+=============
+> mvn clean verify -P suml
+
+To build suml
+=============
+> mvn clean verify -P visualization
diff --git a/annotations/.project b/annotations/.project
new file mode 100644
index 0000000..c85bc51
--- /dev/null
+++ b/annotations/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>annotations</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/.classpath b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/.classpath
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/.classpath
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/.classpath
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/.project b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/.project
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/.project
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/.project
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/META-INF/MANIFEST.MF b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/META-INF/MANIFEST.MF
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/META-INF/MANIFEST.MF
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/META-INF/services/javax.annotation.processing.Processor b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/META-INF/services/javax.annotation.processing.Processor
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/META-INF/services/javax.annotation.processing.Processor
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/META-INF/services/javax.annotation.processing.Processor
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/about.html b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/about.html
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/about.html
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/about.html
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/build.properties b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/build.properties
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/build.properties
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/build.properties
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/icons/fumlib16x16.png b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/icons/fumlib16x16.png
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/icons/fumlib16x16.png
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/icons/fumlib16x16.png
Binary files differ
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/plugin.xml b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/plugin.xml
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/plugin.xml
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/plugin.xml
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/pom.xml b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/pom.xml
similarity index 95%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/pom.xml
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/pom.xml
index f761346..c23f6bd 100644
--- a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/pom.xml
+++ b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/pom.xml
@@ -6,7 +6,7 @@
 	<!-- Parent POM (Tools) -->
 	<parent>
 		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<groupId>org.eclipse.papyrus.moka.annotations</groupId>
 		<artifactId>org.eclipse.papyrus.moka.incubation.annotation.root</artifactId>
 	</parent>
 
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/Activator.java b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/Activator.java
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/Activator.java
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/Activator.java
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBImplementation.java b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBImplementation.java
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBImplementation.java
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBImplementation.java
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBInParam.java b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBInParam.java
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBInParam.java
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBInParam.java
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBLibraryClass.java b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBLibraryClass.java
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBLibraryClass.java
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBLibraryClass.java
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBOutParam.java b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBOutParam.java
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBOutParam.java
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBOutParam.java
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/AnnotationUtil.java b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/AnnotationUtil.java
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/AnnotationUtil.java
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/AnnotationUtil.java
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/ExtensionHandler.java b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/ExtensionHandler.java
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/ExtensionHandler.java
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/ExtensionHandler.java
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryData.java b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryData.java
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryData.java
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryData.java
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryExtensionData.java b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryExtensionData.java
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryExtensionData.java
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryExtensionData.java
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryExtensionHandler.java b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryExtensionHandler.java
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryExtensionHandler.java
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryExtensionHandler.java
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryProcessor.java b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryProcessor.java
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryProcessor.java
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryProcessor.java
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlUMLGenerator.java b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlUMLGenerator.java
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlUMLGenerator.java
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlUMLGenerator.java
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/PluginUtil.java b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/PluginUtil.java
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/PluginUtil.java
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/PluginUtil.java
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/UMLLibraryExtensionData.java b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/UMLLibraryExtensionData.java
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/UMLLibraryExtensionData.java
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/UMLLibraryExtensionData.java
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/UMLLibraryExtensionHandler.java b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/UMLLibraryExtensionHandler.java
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/UMLLibraryExtensionHandler.java
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/UMLLibraryExtensionHandler.java
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/URIMappingExtensionData.java b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/URIMappingExtensionData.java
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/URIMappingExtensionData.java
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/URIMappingExtensionData.java
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/URIMappingExtensionHandler.java b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/URIMappingExtensionHandler.java
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/URIMappingExtensionHandler.java
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/URIMappingExtensionHandler.java
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/xtend/BehaviorRegistryGenerator.xtend b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/xtend/BehaviorRegistryGenerator.xtend
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/xtend/BehaviorRegistryGenerator.xtend
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/xtend/BehaviorRegistryGenerator.xtend
diff --git a/bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/xtend/OpaqueBehaviorExecutionGenerator.xtend b/annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/xtend/OpaqueBehaviorExecutionGenerator.xtend
similarity index 100%
rename from bundles/annotations/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/xtend/OpaqueBehaviorExecutionGenerator.xtend
rename to annotations/bundles/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/xtend/OpaqueBehaviorExecutionGenerator.xtend
diff --git a/bundles/annotations/pom.xml b/annotations/bundles/pom.xml
similarity index 83%
rename from bundles/annotations/pom.xml
rename to annotations/bundles/pom.xml
index 86c8a90..990fec5 100644
--- a/bundles/annotations/pom.xml
+++ b/annotations/bundles/pom.xml
@@ -7,8 +7,8 @@
 	<!-- Parent of this POM -->
 	<parent>
 		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.bundles.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.annotations</groupId>
+		<artifactId>org.eclipse.papyrus.moka.annotations.root</artifactId>
 	</parent>
 
 	<!-- Moka project root POM (aggregator) -->
diff --git a/features/org.eclipse.papyrus.moka.annotations.feature/.project b/annotations/features/org.eclipse.papyrus.moka.annotations.feature/.project
similarity index 100%
rename from features/org.eclipse.papyrus.moka.annotations.feature/.project
rename to annotations/features/org.eclipse.papyrus.moka.annotations.feature/.project
diff --git a/features/org.eclipse.papyrus.moka.annotations.feature/about.html b/annotations/features/org.eclipse.papyrus.moka.annotations.feature/about.html
similarity index 100%
rename from features/org.eclipse.papyrus.moka.annotations.feature/about.html
rename to annotations/features/org.eclipse.papyrus.moka.annotations.feature/about.html
diff --git a/features/org.eclipse.papyrus.moka.annotations.feature/build.properties b/annotations/features/org.eclipse.papyrus.moka.annotations.feature/build.properties
similarity index 100%
rename from features/org.eclipse.papyrus.moka.annotations.feature/build.properties
rename to annotations/features/org.eclipse.papyrus.moka.annotations.feature/build.properties
diff --git a/features/org.eclipse.papyrus.moka.annotations.feature/feature.properties b/annotations/features/org.eclipse.papyrus.moka.annotations.feature/feature.properties
similarity index 100%
rename from features/org.eclipse.papyrus.moka.annotations.feature/feature.properties
rename to annotations/features/org.eclipse.papyrus.moka.annotations.feature/feature.properties
diff --git a/features/org.eclipse.papyrus.moka.annotations.feature/feature.xml b/annotations/features/org.eclipse.papyrus.moka.annotations.feature/feature.xml
similarity index 100%
rename from features/org.eclipse.papyrus.moka.annotations.feature/feature.xml
rename to annotations/features/org.eclipse.papyrus.moka.annotations.feature/feature.xml
diff --git a/features/org.eclipse.papyrus.moka.annotations.feature/pom.xml b/annotations/features/org.eclipse.papyrus.moka.annotations.feature/pom.xml
similarity index 80%
rename from features/org.eclipse.papyrus.moka.annotations.feature/pom.xml
rename to annotations/features/org.eclipse.papyrus.moka.annotations.feature/pom.xml
index cafda8c..403ec56 100644
--- a/features/org.eclipse.papyrus.moka.annotations.feature/pom.xml
+++ b/annotations/features/org.eclipse.papyrus.moka.annotations.feature/pom.xml
@@ -3,8 +3,8 @@
 	
 	<!-- Parent POM (i.e., POM located in the feature folder) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.features.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.annotations</groupId>
+		<artifactId>org.eclipse.papyrus.moka.annotations.features</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 	
diff --git a/annotations/features/pom.xml b/annotations/features/pom.xml
new file mode 100644
index 0000000..f716a85
--- /dev/null
+++ b/annotations/features/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.annotations</groupId>
+		<artifactId>org.eclipse.papyrus.moka.annotations.root</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.annotations.features</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.moka.annotations.feature</module>
+	</modules>	
+	
+</project>
\ No newline at end of file
diff --git a/annotations/pom.xml b/annotations/pom.xml
new file mode 100644
index 0000000..cc61a87
--- /dev/null
+++ b/annotations/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<artifactId>org.eclipse.papyrus.moka.incubation.root</artifactId>		
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<groupId>org.eclipse.papyrus.moka.annotations</groupId>
+	<artifactId>org.eclipse.papyrus.moka.annotations.root</artifactId>
+	<version>0.7.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+		
+	<profiles>
+		<profile>
+			<id>annotations</id>	
+			<properties>
+				<targetplatform.groupId>org.eclipse.papyrus.moka.annotations</targetplatform.groupId>
+				<targetplatform.artifactId>org.eclipse.papyrus.moka.annotations.targetplatform</targetplatform.artifactId>
+				<targetplatform.version>0.7.0-SNAPSHOT</targetplatform.version>
+			</properties>
+			
+			<modules>
+				<module>bundles</module>
+				<module>features</module>
+				<module>releng</module>
+			</modules>
+		</profile>
+	</profiles>
+	
+</project>
\ No newline at end of file
diff --git a/annotations/releng/org.eclipse.papyrus.moka.annotations.p2/.project b/annotations/releng/org.eclipse.papyrus.moka.annotations.p2/.project
new file mode 100644
index 0000000..0a79233
--- /dev/null
+++ b/annotations/releng/org.eclipse.papyrus.moka.annotations.p2/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.incubation.p2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/annotations/releng/org.eclipse.papyrus.moka.annotations.p2/category.xml b/annotations/releng/org.eclipse.papyrus.moka.annotations.p2/category.xml
new file mode 100644
index 0000000..4ecb2b0
--- /dev/null
+++ b/annotations/releng/org.eclipse.papyrus.moka.annotations.p2/category.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+  <feature url="features/org.eclipse.papyrus.moka.annotations.feature_0.7.0.qualifier.jar" id="org.eclipse.papyrus.moka.annotations.feature" version="0.7.0.qualifier">
+      <category name="org.eclipse.papyrus.moka.incubation.category"/>
+   </feature>
+  
+  <category-def name="org.eclipse.papyrus.moka.incubation.category" label="Papyrus Moka Incubation">
+      <description>
+         Papyrus Moka Incubation features
+      </description>
+   </category-def>
+</site>
diff --git a/annotations/releng/org.eclipse.papyrus.moka.annotations.p2/pom.xml b/annotations/releng/org.eclipse.papyrus.moka.annotations.p2/pom.xml
new file mode 100644
index 0000000..c89066a
--- /dev/null
+++ b/annotations/releng/org.eclipse.papyrus.moka.annotations.p2/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.annotations</groupId>
+		<artifactId>org.eclipse.papyrus.moka.annotations.releng</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.annotations.p2</artifactId>
+	<packaging>eclipse-repository</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/annotations/releng/pom.xml b/annotations/releng/pom.xml
new file mode 100644
index 0000000..a541efd
--- /dev/null
+++ b/annotations/releng/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.annotations</groupId>
+		<artifactId>org.eclipse.papyrus.moka.annotations.root</artifactId>		
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.annotations.releng</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.moka.annotations.p2</module>
+		<module>targetplatform</module>
+	</modules>	
+	
+</project>
\ No newline at end of file
diff --git a/annotations/releng/targetplatform/org.eclipse.papyrus.moka.annotations.targetplatform.target b/annotations/releng/targetplatform/org.eclipse.papyrus.moka.annotations.targetplatform.target
new file mode 100644
index 0000000..15022a4
--- /dev/null
+++ b/annotations/releng/targetplatform/org.eclipse.papyrus.moka.annotations.targetplatform.target
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Moka incubation - Annotations" sequenceNumber="1626438335">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse" location="http://download.eclipse.org/releases/2020-12"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.moka.feature.feature.group" version="0.0.0"/>
+      <repository id="moka" location="https://ci.eclipse.org/papyrus/view/Moka/job/papyrus-moka-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.moka.p2/target/repository/"/>
+    </location>
+  </locations>
+</target>
diff --git a/annotations/releng/targetplatform/org.eclipse.papyrus.moka.annotations.targetplatform.tpd b/annotations/releng/targetplatform/org.eclipse.papyrus.moka.annotations.targetplatform.tpd
new file mode 100644
index 0000000..f70aa62
--- /dev/null
+++ b/annotations/releng/targetplatform/org.eclipse.papyrus.moka.annotations.targetplatform.tpd
@@ -0,0 +1,11 @@
+target "Moka incubation - Annotations" with source requirements
+
+location "http://download.eclipse.org/releases/2020-12" eclipse {
+	org.eclipse.platform.feature.group lazy
+	org.eclipse.xtend.sdk.feature.group lazy
+	org.eclipse.papyrus.sdk.feature.feature.group lazy
+}
+
+location "https://ci.eclipse.org/papyrus/view/Moka/job/papyrus-moka-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.moka.p2/target/repository/" moka {
+	org.eclipse.papyrus.moka.feature.feature.group lazy
+}
diff --git a/annotations/releng/targetplatform/pom.xml b/annotations/releng/targetplatform/pom.xml
new file mode 100644
index 0000000..a11e350
--- /dev/null
+++ b/annotations/releng/targetplatform/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.annotations</groupId>
+		<artifactId>org.eclipse.papyrus.moka.annotations.releng</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.annotations.targetplatform</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	
+</project>
\ No newline at end of file
diff --git a/bundles/externalcontrol/pom.xml b/bundles/externalcontrol/pom.xml
deleted file mode 100644
index 33af170..0000000
--- a/bundles/externalcontrol/pom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	
-	<modelVersion>4.0.0</modelVersion>
-	
-	<!-- Parent POM (i.e., Core) -->
-	<parent>
-		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.bundles.root</artifactId>
-	</parent>
-	
-	<!-- POM Description -->
-	<artifactId>org.eclipse.papyrus.moka.incubation.externalcontrol.root</artifactId>
-	<name>Moka Data External Control Tool</name>
-	<packaging>pom</packaging>
-	
-	<!-- Modules to build -->
-	<modules>
-		<module>org.eclipse.papyrus.moka.externalcontrol</module>
-	</modules>
-	
-</project>
diff --git a/bundles/pom.xml b/bundles/pom.xml
deleted file mode 100644
index 8641fe8..0000000
--- a/bundles/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<!-- Parent of this POM -->
-	<parent>
-		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.root</artifactId>
-	</parent>
-
-	<!-- Moka project root POM (aggregator) -->
-	<artifactId>org.eclipse.papyrus.moka.incubation.bundles.root</artifactId>
-	<name>Moka Incubation Bundles</name>
-	<packaging>pom</packaging>
-
-	<!-- Children modules to build -->
-	<modules>
-		<module>annotations</module>
-		<module>instancespecification</module>
-		<module>parametric</module>
-		<module>scripting</module>
-		<module>simex</module>
-		<module>suml</module>
-		<module>visualization</module>
-		<module>externalcontrol</module>
-		<!-- <module>fmi</module> -->
-	</modules>
-
-</project>
diff --git a/externalcontrol/.project b/externalcontrol/.project
new file mode 100644
index 0000000..6afcc4f
--- /dev/null
+++ b/externalcontrol/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>externalcontrol</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/.classpath b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/.classpath
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/.classpath
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/.classpath
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/.project b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/.project
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/.project
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/.project
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/META-INF/MANIFEST.MF b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/META-INF/MANIFEST.MF
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/META-INF/MANIFEST.MF
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/about.html b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/about.html
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/about.html
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/about.html
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/aspects/org/eclipse/papyrus/moka/externalcontrol/profiling/IExternallyControlledVisitorProfiler.aj b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/aspects/org/eclipse/papyrus/moka/externalcontrol/profiling/IExternallyControlledVisitorProfiler.aj
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/aspects/org/eclipse/papyrus/moka/externalcontrol/profiling/IExternallyControlledVisitorProfiler.aj
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/aspects/org/eclipse/papyrus/moka/externalcontrol/profiling/IExternallyControlledVisitorProfiler.aj
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/build.properties b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/build.properties
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/build.properties
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/build.properties
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/doc/ExternalControl.di b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/doc/ExternalControl.di
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/doc/ExternalControl.di
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/doc/ExternalControl.di
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/doc/ExternalControl.notation b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/doc/ExternalControl.notation
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/doc/ExternalControl.notation
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/doc/ExternalControl.notation
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/doc/ExternalControl.uml b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/doc/ExternalControl.uml
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/doc/ExternalControl.uml
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/doc/ExternalControl.uml
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/doc/doc.di b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/doc/doc.di
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/doc/doc.di
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/doc/doc.di
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/doc/doc.notation b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/doc/doc.notation
similarity index 99%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/doc/doc.notation
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/doc/doc.notation
index 5436ea2..dbeeed0 100644
--- a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/doc/doc.notation
+++ b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/doc/doc.notation
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?> 
 <notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_hzxSAFhSEeiSk_egVxEj3Q" type="PapyrusUMLActivityDiagram" name="Activity Diagram" measurementUnit="Pixel">
   <children xmi:type="notation:Shape" xmi:id="_hzxSAVhSEeiSk_egVxEj3Q" type="Activity_Shape">
     <children xmi:type="notation:DecorationNode" xmi:id="_hzxSAlhSEeiSk_egVxEj3Q" type="Activity_NameLabel"/>
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/doc/doc.uml b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/doc/doc.uml
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/doc/doc.uml
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/doc/doc.uml
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/plugin.xml b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/plugin.xml
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/plugin.xml
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/plugin.xml
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/pom.xml b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/pom.xml
similarity index 78%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/pom.xml
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/pom.xml
index f2e4c4b..158d771 100644
--- a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/pom.xml
+++ b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/pom.xml
@@ -4,8 +4,8 @@
 
 	<!-- Parent POM (Tools) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.externalcontrol.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.externalcontrol</groupId>
+		<artifactId>org.eclipse.papyrus.moka.externalcontrol.plugins</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/Activator.java b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/Activator.java
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/Activator.java
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/Activator.java
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/BasicControllerAdvice.java b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/BasicControllerAdvice.java
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/BasicControllerAdvice.java
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/BasicControllerAdvice.java
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/IControllerAdvice.java b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/IControllerAdvice.java
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/IControllerAdvice.java
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/IControllerAdvice.java
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/IControllerAdviceFactory.java b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/IControllerAdviceFactory.java
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/IControllerAdviceFactory.java
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/IControllerAdviceFactory.java
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/control/queue/ExternallyControlledExecutionLoop.java b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/control/queue/ExternallyControlledExecutionLoop.java
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/control/queue/ExternallyControlledExecutionLoop.java
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/control/queue/ExternallyControlledExecutionLoop.java
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/AbstractExternallyControlledVisitor.java b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/AbstractExternallyControlledVisitor.java
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/AbstractExternallyControlledVisitor.java
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/AbstractExternallyControlledVisitor.java
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/ControlledVisitorStep.java b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/ControlledVisitorStep.java
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/ControlledVisitorStep.java
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/ControlledVisitorStep.java
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/ExternalController.java b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/ExternalController.java
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/ExternalController.java
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/ExternalController.java
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/IControlledVisitorPushPullStrategy.java b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/IControlledVisitorPushPullStrategy.java
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/IControlledVisitorPushPullStrategy.java
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/IControlledVisitorPushPullStrategy.java
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/IExternallyControlledVisitor.java b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/IExternallyControlledVisitor.java
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/IExternallyControlledVisitor.java
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/IExternallyControlledVisitor.java
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/LIFOPushPullStrategy.java b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/LIFOPushPullStrategy.java
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/LIFOPushPullStrategy.java
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/LIFOPushPullStrategy.java
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/NodeEdgeAlternatePushPullStrategy.java b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/NodeEdgeAlternatePushPullStrategy.java
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/NodeEdgeAlternatePushPullStrategy.java
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/NodeEdgeAlternatePushPullStrategy.java
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/engine/AbstractExternalControlExecutionEngine.java b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/engine/AbstractExternalControlExecutionEngine.java
similarity index 99%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/engine/AbstractExternalControlExecutionEngine.java
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/engine/AbstractExternalControlExecutionEngine.java
index ee2d135..1b9d38f 100644
--- a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/engine/AbstractExternalControlExecutionEngine.java
+++ b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/engine/AbstractExternalControlExecutionEngine.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * 
- * Copyright (c) 2017 CEA LIST.
+ * Copyright (c) 2017 CEA LIST. 
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -122,7 +122,7 @@
 				externalController, getAdviceFactories());
 		locus.setFactory(externalControlExecutionFactory);
 		return locus;
-	}
+	} 
 
 	@Override
 	public IExecutionController createController() {
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/AbstractExternallyControlledActionActivation.java b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/AbstractExternallyControlledActionActivation.java
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/AbstractExternallyControlledActionActivation.java
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/AbstractExternallyControlledActionActivation.java
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternalControlExecutionFactory.java b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternalControlExecutionFactory.java
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternalControlExecutionFactory.java
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternalControlExecutionFactory.java
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternalControlExecutor.java b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternalControlExecutor.java
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternalControlExecutor.java
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternalControlExecutor.java
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActionActivation.java b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActionActivation.java
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActionActivation.java
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActionActivation.java
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActivityEdgeInstance.java b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActivityEdgeInstance.java
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActivityEdgeInstance.java
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActivityEdgeInstance.java
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActivityExecution.java b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActivityExecution.java
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActivityExecution.java
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActivityExecution.java
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledCallActionActivation.java b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledCallActionActivation.java
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledCallActionActivation.java
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledCallActionActivation.java
diff --git a/bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/util/PushPullStrategyUtil.java b/externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/util/PushPullStrategyUtil.java
similarity index 100%
rename from bundles/externalcontrol/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/util/PushPullStrategyUtil.java
rename to externalcontrol/bundles/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/util/PushPullStrategyUtil.java
diff --git a/externalcontrol/bundles/pom.xml b/externalcontrol/bundles/pom.xml
new file mode 100644
index 0000000..072ca01
--- /dev/null
+++ b/externalcontrol/bundles/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.externalcontrol</groupId>
+		<artifactId>org.eclipse.papyrus.moka.externalcontrol.root</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.externalcontrol.plugins</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.moka.externalcontrol</module>
+	</modules>	
+	
+</project>
\ No newline at end of file
diff --git a/features/org.eclipse.papyrus.moka.externalcontrol.feature/.project b/externalcontrol/features/org.eclipse.papyrus.moka.externalcontrol.feature/.project
similarity index 100%
rename from features/org.eclipse.papyrus.moka.externalcontrol.feature/.project
rename to externalcontrol/features/org.eclipse.papyrus.moka.externalcontrol.feature/.project
diff --git a/features/org.eclipse.papyrus.moka.externalcontrol.feature/about.html b/externalcontrol/features/org.eclipse.papyrus.moka.externalcontrol.feature/about.html
similarity index 100%
rename from features/org.eclipse.papyrus.moka.externalcontrol.feature/about.html
rename to externalcontrol/features/org.eclipse.papyrus.moka.externalcontrol.feature/about.html
diff --git a/features/org.eclipse.papyrus.moka.externalcontrol.feature/build.properties b/externalcontrol/features/org.eclipse.papyrus.moka.externalcontrol.feature/build.properties
similarity index 100%
rename from features/org.eclipse.papyrus.moka.externalcontrol.feature/build.properties
rename to externalcontrol/features/org.eclipse.papyrus.moka.externalcontrol.feature/build.properties
diff --git a/features/org.eclipse.papyrus.moka.externalcontrol.feature/feature.properties b/externalcontrol/features/org.eclipse.papyrus.moka.externalcontrol.feature/feature.properties
similarity index 100%
rename from features/org.eclipse.papyrus.moka.externalcontrol.feature/feature.properties
rename to externalcontrol/features/org.eclipse.papyrus.moka.externalcontrol.feature/feature.properties
diff --git a/features/org.eclipse.papyrus.moka.externalcontrol.feature/feature.xml b/externalcontrol/features/org.eclipse.papyrus.moka.externalcontrol.feature/feature.xml
similarity index 100%
rename from features/org.eclipse.papyrus.moka.externalcontrol.feature/feature.xml
rename to externalcontrol/features/org.eclipse.papyrus.moka.externalcontrol.feature/feature.xml
diff --git a/features/org.eclipse.papyrus.moka.externalcontrol.feature/pom.xml b/externalcontrol/features/org.eclipse.papyrus.moka.externalcontrol.feature/pom.xml
similarity index 81%
rename from features/org.eclipse.papyrus.moka.externalcontrol.feature/pom.xml
rename to externalcontrol/features/org.eclipse.papyrus.moka.externalcontrol.feature/pom.xml
index d2ef6fb..82bd43c 100644
--- a/features/org.eclipse.papyrus.moka.externalcontrol.feature/pom.xml
+++ b/externalcontrol/features/org.eclipse.papyrus.moka.externalcontrol.feature/pom.xml
@@ -3,8 +3,8 @@
 	
 	<!-- Parent POM (i.e., POM located in the feature folder) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.features.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.externalcontrol</groupId>
+		<artifactId>org.eclipse.papyrus.moka.externalcontrol.features</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 	
diff --git a/externalcontrol/features/pom.xml b/externalcontrol/features/pom.xml
new file mode 100644
index 0000000..bffe0fc
--- /dev/null
+++ b/externalcontrol/features/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.externalcontrol</groupId>
+		<artifactId>org.eclipse.papyrus.moka.externalcontrol.root</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.externalcontrol.features</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.moka.externalcontrol.feature</module>
+	</modules>	
+	
+</project>
\ No newline at end of file
diff --git a/externalcontrol/pom.xml b/externalcontrol/pom.xml
new file mode 100644
index 0000000..d433f11
--- /dev/null
+++ b/externalcontrol/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<artifactId>org.eclipse.papyrus.moka.incubation.root</artifactId>		
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<groupId>org.eclipse.papyrus.moka.externalcontrol</groupId>
+	<artifactId>org.eclipse.papyrus.moka.externalcontrol.root</artifactId>
+	<version>0.7.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	
+	<profiles>
+		<profile>
+			<id>externalcontrol</id>	
+			<properties>
+				<targetplatform.groupId>org.eclipse.papyrus.moka.externalcontrol</targetplatform.groupId>
+				<targetplatform.artifactId>org.eclipse.papyrus.moka.externalcontrol.targetplatform</targetplatform.artifactId>
+				<targetplatform.version>0.7.0-SNAPSHOT</targetplatform.version>
+			</properties>
+			
+			<modules>
+				<module>bundles</module>
+				<module>features</module>
+				<module>releng</module>
+			</modules>
+		</profile>
+	</profiles>
+	
+</project>
\ No newline at end of file
diff --git a/externalcontrol/releng/org.eclipse.papyrus.moka.externalcontrol.p2/.project b/externalcontrol/releng/org.eclipse.papyrus.moka.externalcontrol.p2/.project
new file mode 100644
index 0000000..0a79233
--- /dev/null
+++ b/externalcontrol/releng/org.eclipse.papyrus.moka.externalcontrol.p2/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.incubation.p2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/externalcontrol/releng/org.eclipse.papyrus.moka.externalcontrol.p2/category.xml b/externalcontrol/releng/org.eclipse.papyrus.moka.externalcontrol.p2/category.xml
new file mode 100644
index 0000000..9e8d234
--- /dev/null
+++ b/externalcontrol/releng/org.eclipse.papyrus.moka.externalcontrol.p2/category.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+  <feature url="features/org.eclipse.papyrus.moka.externalcontrol.feature_0.7.0.qualifier.jar" id="org.eclipse.papyrus.moka.externalcontrol.feature" version="0.7.0.qualifier">
+      <category name="org.eclipse.papyrus.moka.incubation.category"/>
+   </feature>
+  
+  <category-def name="org.eclipse.papyrus.moka.incubation.category" label="Papyrus Moka Incubation">
+      <description>
+         Papyrus Moka Incubation features
+      </description>
+   </category-def>
+</site>
diff --git a/externalcontrol/releng/org.eclipse.papyrus.moka.externalcontrol.p2/pom.xml b/externalcontrol/releng/org.eclipse.papyrus.moka.externalcontrol.p2/pom.xml
new file mode 100644
index 0000000..63d2757
--- /dev/null
+++ b/externalcontrol/releng/org.eclipse.papyrus.moka.externalcontrol.p2/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.externalcontrol</groupId>
+		<artifactId>org.eclipse.papyrus.moka.externalcontrol.releng</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.externalcontrol.p2</artifactId>
+	<packaging>eclipse-repository</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/externalcontrol/releng/pom.xml b/externalcontrol/releng/pom.xml
new file mode 100644
index 0000000..8d4067d
--- /dev/null
+++ b/externalcontrol/releng/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.externalcontrol</groupId>
+		<artifactId>org.eclipse.papyrus.moka.externalcontrol.root</artifactId>		
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.externalcontrol.releng</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.moka.externalcontrol.p2</module>
+		<module>targetplatform</module>
+	</modules>	
+	
+</project>
\ No newline at end of file
diff --git a/externalcontrol/releng/targetplatform/org.eclipse.papyrus.moka.externalcontrol.targetplatform.target b/externalcontrol/releng/targetplatform/org.eclipse.papyrus.moka.externalcontrol.targetplatform.target
new file mode 100644
index 0000000..dea4ef7
--- /dev/null
+++ b/externalcontrol/releng/targetplatform/org.eclipse.papyrus.moka.externalcontrol.targetplatform.target
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Moka incubation - External Control" sequenceNumber="1626424550">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+      <repository id="eclipse" location="http://download.eclipse.org/releases/2020-12"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.moka.feature.feature.group" version="0.0.0"/>
+      <repository id="moka" location="https://ci.eclipse.org/papyrus/view/Moka/job/papyrus-moka-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.moka.p2/target/repository/"/>
+    </location>
+  </locations>
+</target>
diff --git a/externalcontrol/releng/targetplatform/org.eclipse.papyrus.moka.externalcontrol.targetplatform.tpd b/externalcontrol/releng/targetplatform/org.eclipse.papyrus.moka.externalcontrol.targetplatform.tpd
new file mode 100644
index 0000000..ad6f356
--- /dev/null
+++ b/externalcontrol/releng/targetplatform/org.eclipse.papyrus.moka.externalcontrol.targetplatform.tpd
@@ -0,0 +1,9 @@
+target "Moka incubation - External Control" with source requirements
+
+location "http://download.eclipse.org/releases/2020-12" eclipse {
+	org.eclipse.platform.feature.group lazy
+}
+
+location "https://ci.eclipse.org/papyrus/view/Moka/job/papyrus-moka-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.moka.p2/target/repository/" moka {
+	org.eclipse.papyrus.moka.feature.feature.group lazy
+}
\ No newline at end of file
diff --git a/externalcontrol/releng/targetplatform/pom.xml b/externalcontrol/releng/targetplatform/pom.xml
new file mode 100644
index 0000000..bcbdd00
--- /dev/null
+++ b/externalcontrol/releng/targetplatform/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.externalcontrol</groupId>
+		<artifactId>org.eclipse.papyrus.moka.externalcontrol.releng</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.externalcontrol.targetplatform</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	
+</project>
\ No newline at end of file
diff --git a/features/pom.xml b/features/pom.xml
deleted file mode 100644
index b1a4dd5..0000000
--- a/features/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<!-- Parent of this POM -->
-	<parent>
-		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.root</artifactId>
-	</parent>
-
-	<!-- Moka project root POM (aggregator) -->
-	<artifactId>org.eclipse.papyrus.moka.incubation.features.root</artifactId>
-	<name>Moka Incubation Features</name>
-	<packaging>pom</packaging>
-
-	<!-- Children modules to build -->
-	<modules>
-		<module>org.eclipse.papyrus.moka.annotations.feature</module>
-		<!--<module>org.eclipse.papyrus.moka.fmi.feature</module> -->
-		<!--<module>org.eclipse.papyrus.moka.fmi.scripting.feature</module> -->
-		<module>org.eclipse.papyrus.moka.externalcontrol.feature</module>
-		<module>org.eclipse.papyrus.moka.instancespecification.feature</module>
-		<module>org.eclipse.papyrus.moka.parametric.feature</module>
-		<module>org.eclipse.papyrus.moka.engine.suml.feature</module>
-		<module>org.eclipse.papyrus.moka.simex.feature</module>
-		<module>org.eclipse.papyrus.moka.visualization.feature</module>
-	</modules>
-
-</project>
diff --git a/fmi/.project b/fmi/.project
new file mode 100644
index 0000000..d660c1e
--- /dev/null
+++ b/fmi/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>fmi</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/.classpath b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/.classpath
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/.classpath
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/.classpath
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/.gitignore b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/.gitignore
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/.gitignore
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/.gitignore
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/.project b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/.project
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/.project
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/.project
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/META-INF/MANIFEST.MF b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/META-INF/MANIFEST.MF
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/META-INF/MANIFEST.MF
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/about.html b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/about.html
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/about.html
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/about.html
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/build.properties b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/build.properties
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/build.properties
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/build.properties
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/plugin.xml b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/plugin.xml
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/plugin.xml
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/plugin.xml
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/pom.xml b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/pom.xml
similarity index 91%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/pom.xml
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/pom.xml
index 73f584a..65e4c9e 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/pom.xml
+++ b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/pom.xml
@@ -4,7 +4,7 @@
 
 	<!-- Parent POM (i.e., Engines) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.engines</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/resources/fmu2Proxy.di b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/resources/fmu2Proxy.di
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/resources/fmu2Proxy.di
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/resources/fmu2Proxy.di
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/resources/fmu2Proxy.notation b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/resources/fmu2Proxy.notation
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/resources/fmu2Proxy.notation
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/resources/fmu2Proxy.notation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/resources/fmu2Proxy.uml b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/resources/fmu2Proxy.uml
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/resources/fmu2Proxy.uml
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/resources/fmu2Proxy.uml
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/resources/master.di b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/resources/master.di
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/resources/master.di
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/resources/master.di
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/resources/master.notation b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/resources/master.notation
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/resources/master.notation
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/resources/master.notation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/resources/master.uml b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/resources/master.uml
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/resources/master.uml
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/resources/master.uml
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/resources/master2Proxy.di b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/resources/master2Proxy.di
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/resources/master2Proxy.di
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/resources/master2Proxy.di
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/resources/master2Proxy.notation b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/resources/master2Proxy.notation
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/resources/master2Proxy.notation
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/resources/master2Proxy.notation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/resources/master2Proxy.uml b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/resources/master2Proxy.uml
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/resources/master2Proxy.uml
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/resources/master2Proxy.uml
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/Activator.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/Activator.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/Activator.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/Activator.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2CausalityType.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2CausalityType.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2CausalityType.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2CausalityType.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2DependencyKind.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2DependencyKind.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2DependencyKind.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2DependencyKind.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2InitialType.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2InitialType.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2InitialType.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2InitialType.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Parameters.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Parameters.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Parameters.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Parameters.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Port.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Port.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Port.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Port.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2ScalarVariable.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2ScalarVariable.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2ScalarVariable.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2ScalarVariable.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Type.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Type.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Type.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Type.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2VariabilityType.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2VariabilityType.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2VariabilityType.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2VariabilityType.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2VariableType.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2VariableType.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2VariableType.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2VariableType.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmuproxy/Fmu2ProxyService.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmuproxy/Fmu2ProxyService.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmuproxy/Fmu2ProxyService.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmuproxy/Fmu2ProxyService.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2AllocatorImpl.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2AllocatorImpl.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2AllocatorImpl.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2AllocatorImpl.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2Callbacks.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2Callbacks.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2Callbacks.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2Callbacks.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2FreeMemImpl.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2FreeMemImpl.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2FreeMemImpl.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2FreeMemImpl.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/JNRFMUInterface.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/JNRFMUInterface.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/JNRFMUInterface.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/JNRFMUInterface.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/SimpleFMI2LoggerImpl.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/SimpleFMI2LoggerImpl.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/SimpleFMI2LoggerImpl.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/SimpleFMI2LoggerImpl.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/CoSimEnvironment.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/CoSimEnvironment.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/CoSimEnvironment.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/CoSimEnvironment.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/DependencyGraph.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/DependencyGraph.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/DependencyGraph.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/DependencyGraph.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Edge.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Edge.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Edge.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Edge.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Experiments.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Experiments.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Experiments.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Experiments.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Node.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Node.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Node.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Node.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyService.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyService.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyService.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyService.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyServiceFactory.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyServiceFactory.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyServiceFactory.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyServiceFactory.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyServiceRegistery.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyServiceRegistery.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyServiceRegistery.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyServiceRegistery.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/template/SimpleMasterTemplate.di b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/template/SimpleMasterTemplate.di
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/template/SimpleMasterTemplate.di
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/template/SimpleMasterTemplate.di
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/template/SimpleMasterTemplate.notation b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/template/SimpleMasterTemplate.notation
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/template/SimpleMasterTemplate.notation
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/template/SimpleMasterTemplate.notation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/template/SimpleMasterTemplate.uml b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/template/SimpleMasterTemplate.uml
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/template/SimpleMasterTemplate.uml
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmi.master/template/SimpleMasterTemplate.uml
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/.classpath b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine.debug/.classpath
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/.classpath
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine.debug/.classpath
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/.project b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine.debug/.project
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/.project
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine.debug/.project
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/META-INF/MANIFEST.MF b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine.debug/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/META-INF/MANIFEST.MF
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine.debug/META-INF/MANIFEST.MF
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/about.html b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine.debug/about.html
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/about.html
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine.debug/about.html
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/build.properties b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine.debug/build.properties
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/build.properties
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine.debug/build.properties
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/plugin.xml b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine.debug/plugin.xml
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/plugin.xml
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine.debug/plugin.xml
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/pom.xml b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine.debug/pom.xml
similarity index 92%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/pom.xml
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine.debug/pom.xml
index 91a8932..ec855e1 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/pom.xml
+++ b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine.debug/pom.xml
@@ -4,7 +4,7 @@
 
 	<!-- Parent POM (i.e., Tools) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.engines</artifactId>		
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/Activator.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/Activator.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/Activator.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/Activator.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/FMUDebugDialog.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/FMUDebugDialog.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/FMUDebugDialog.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/FMUDebugDialog.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/MokaEngineForFMUDebug.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/MokaEngineForFMUDebug.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/MokaEngineForFMUDebug.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/MokaEngineForFMUDebug.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/.classpath b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/.classpath
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/.classpath
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/.classpath
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/.project b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/.project
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/.project
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/.project
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/META-INF/MANIFEST.MF b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/META-INF/MANIFEST.MF
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/META-INF/MANIFEST.MF
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/about.html b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/about.html
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/about.html
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/about.html
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/build.properties b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/build.properties
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/build.properties
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/build.properties
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/plugin.xml b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/plugin.xml
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/plugin.xml
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/plugin.xml
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/pom.xml b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/pom.xml
similarity index 92%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/pom.xml
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/pom.xml
index 0e7ddd0..3d2e870 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/pom.xml
+++ b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/pom.xml
@@ -4,7 +4,7 @@
 
 	<!-- Parent POM (i.e., Tools) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.engines</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/communication/AbstractFMU.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/communication/AbstractFMU.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/communication/AbstractFMU.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/communication/AbstractFMU.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/communication/FMUInterface.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/communication/FMUInterface.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/communication/FMUInterface.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/communication/FMUInterface.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/control/queue/FMIRootExecution.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/control/queue/FMIRootExecution.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/control/queue/FMIRootExecution.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/control/queue/FMIRootExecution.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/Activator.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/Activator.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/Activator.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/Activator.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/MokaEngineForFMUExport.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/MokaEngineForFMUExport.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/MokaEngineForFMUExport.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/MokaEngineForFMUExport.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/control/EngineStatus.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/control/EngineStatus.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/control/EngineStatus.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/control/EngineStatus.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/control/FMUControlService.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/control/FMUControlService.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/control/FMUControlService.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/control/FMUControlService.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/de/FMIPushPullStrategy.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/de/FMIPushPullStrategy.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/de/FMIPushPullStrategy.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/de/FMIPushPullStrategy.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/de/FMUStepEnd.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/de/FMUStepEnd.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/de/FMUStepEnd.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/de/FMUStepEnd.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUAddStructuralFeatureValueAction.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUAddStructuralFeatureValueAction.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUAddStructuralFeatureValueAction.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUAddStructuralFeatureValueAction.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUChangeEventOccurence.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUChangeEventOccurence.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUChangeEventOccurence.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUChangeEventOccurence.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUConstructStrategy.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUConstructStrategy.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUConstructStrategy.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUConstructStrategy.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUExecutionFactory.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUExecutionFactory.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUExecutionFactory.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUExecutionFactory.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMULocus.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMULocus.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMULocus.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMULocus.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUObject.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUObject.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUObject.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUObject.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMU_ObjectActivation.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMU_ObjectActivation.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMU_ObjectActivation.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMU_ObjectActivation.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/utils/FMUEngineUtils.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/utils/FMUEngineUtils.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/utils/FMUEngineUtils.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/utils/FMUEngineUtils.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONRequest.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONRequest.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONRequest.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONRequest.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONResponse.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONResponse.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONResponse.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONResponse.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONSocketClient.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONSocketClient.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONSocketClient.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONSocketClient.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/.classpath b/fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/.classpath
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/.classpath
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/.classpath
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/.project b/fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/.project
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/.project
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/.project
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/META-INF/MANIFEST.MF b/fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/META-INF/MANIFEST.MF
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/META-INF/MANIFEST.MF
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/about.html b/fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/about.html
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/about.html
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/about.html
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/build.properties b/fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/build.properties
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/build.properties
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/build.properties
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/plugin.xml b/fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/plugin.xml
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/plugin.xml
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/plugin.xml
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/pom.xml b/fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/pom.xml
similarity index 92%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/pom.xml
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/pom.xml
index ecdc8a8..3984732 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/pom.xml
+++ b/fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/pom.xml
@@ -4,7 +4,7 @@
 
 	<!-- Parent POM (i.e., Engines) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.engines</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/CosimulationExecutionEngine.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/CosimulationExecutionEngine.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/CosimulationExecutionEngine.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/CosimulationExecutionEngine.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/CosimulationFactory.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/CosimulationFactory.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/CosimulationFactory.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/CosimulationFactory.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationAddStructuralFeatureValueActionActivation.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationAddStructuralFeatureValueActionActivation.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationAddStructuralFeatureValueActionActivation.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationAddStructuralFeatureValueActionActivation.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationDefaultConstructStrategy.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationDefaultConstructStrategy.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationDefaultConstructStrategy.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationDefaultConstructStrategy.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationInstanceValueEvaluation.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationInstanceValueEvaluation.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationInstanceValueEvaluation.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationInstanceValueEvaluation.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationLocus.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationLocus.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationLocus.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationLocus.java
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationReadStructuralFeatureActionActivation.java b/fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationReadStructuralFeatureActionActivation.java
similarity index 100%
rename from bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationReadStructuralFeatureActionActivation.java
rename to fmi/bundles/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationReadStructuralFeatureActionActivation.java
diff --git a/bundles/fmi/engines/pom.xml b/fmi/bundles/engines/pom.xml
similarity index 86%
rename from bundles/fmi/engines/pom.xml
rename to fmi/bundles/engines/pom.xml
index 12fd100..1e5bbcc 100644
--- a/bundles/fmi/engines/pom.xml
+++ b/fmi/bundles/engines/pom.xml
@@ -7,8 +7,8 @@
 	
 	<!-- Parent POM (i.e., Bundles) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.fmi.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
+		<artifactId>org.eclipse.papyrus.moka.fmi.bundles.root</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 	
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/.classpath b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/.classpath
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/.classpath
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/.classpath
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/.gitignore b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/.gitignore
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/.gitignore
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/.gitignore
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/.project b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/.project
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/.project
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/.project
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/META-INF/MANIFEST.MF b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/META-INF/MANIFEST.MF
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/META-INF/MANIFEST.MF
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/about.html b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/about.html
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/about.html
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/about.html
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/build.properties b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/build.properties
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/build.properties
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/build.properties
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/model/FMI.profile.di b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/model/FMI.profile.di
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/model/FMI.profile.di
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/model/FMI.profile.di
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/model/FMI.profile.genmodel b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/model/FMI.profile.genmodel
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/model/FMI.profile.genmodel
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/model/FMI.profile.genmodel
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/model/FMI.profile.notation b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/model/FMI.profile.notation
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/model/FMI.profile.notation
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/model/FMI.profile.notation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/model/FMI.profile.uml b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/model/FMI.profile.uml
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/model/FMI.profile.uml
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/model/FMI.profile.uml
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/model/fmiprofile.ecore b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/model/fmiprofile.ecore
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/model/fmiprofile.ecore
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/model/fmiprofile.ecore
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/plugin.properties b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/plugin.properties
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/plugin.properties
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/plugin.properties
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/plugin.xml b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/plugin.xml
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/plugin.xml
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/plugin.xml
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/pom.xml b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/pom.xml
similarity index 91%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/pom.xml
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/pom.xml
index 9a54006..615caa8 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/pom.xml
+++ b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/pom.xml
@@ -4,7 +4,7 @@
 
 	<!-- Parent POM (i.e., Language) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.language</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/AbstractVariable.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/AbstractVariable.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/AbstractVariable.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/AbstractVariable.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/BaseUnit.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/BaseUnit.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/BaseUnit.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/BaseUnit.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CS_FMU.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CS_FMU.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CS_FMU.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CS_FMU.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CS_Graph.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CS_Graph.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CS_Graph.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CS_Graph.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CalculatedParameter.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CalculatedParameter.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CalculatedParameter.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CalculatedParameter.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CausalityKind.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CausalityKind.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CausalityKind.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CausalityKind.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DependenciesKind.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DependenciesKind.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DependenciesKind.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DependenciesKind.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DerivativeDependency.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DerivativeDependency.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DerivativeDependency.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DerivativeDependency.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DerivativeUnknown.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DerivativeUnknown.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DerivativeUnknown.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DerivativeUnknown.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIPort.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIPort.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIPort.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIPort.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIProfileFactory.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIProfileFactory.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIProfileFactory.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIProfileFactory.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIProfilePackage.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIProfilePackage.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIProfilePackage.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIProfilePackage.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMU.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMU.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMU.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMU.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FlowDirection.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FlowDirection.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FlowDirection.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FlowDirection.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Independent.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Independent.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Independent.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Independent.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialKind.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialKind.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialKind.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialKind.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialUnknown.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialUnknown.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialUnknown.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialUnknown.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialUnknownDependency.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialUnknownDependency.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialUnknownDependency.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialUnknownDependency.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Local.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Local.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Local.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Local.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/ME_FMU.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/ME_FMU.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/ME_FMU.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/ME_FMU.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/OutputDependency.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/OutputDependency.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/OutputDependency.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/OutputDependency.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/OutputUnknown.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/OutputUnknown.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/OutputUnknown.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/OutputUnknown.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Parameter.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Parameter.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Parameter.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Parameter.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Port.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Port.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Port.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Port.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/ScalarVariable.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/ScalarVariable.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/ScalarVariable.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/ScalarVariable.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Unknown.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Unknown.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Unknown.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Unknown.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/VariabilityKind.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/VariabilityKind.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/VariabilityKind.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/VariabilityKind.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/VariabilityNamingConvention.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/VariabilityNamingConvention.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/VariabilityNamingConvention.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/VariabilityNamingConvention.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/AbstractVariableImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/AbstractVariableImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/AbstractVariableImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/AbstractVariableImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CS_FMUImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CS_FMUImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CS_FMUImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CS_FMUImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CS_GraphImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CS_GraphImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CS_GraphImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CS_GraphImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CalculatedParameterImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CalculatedParameterImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CalculatedParameterImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CalculatedParameterImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/DerivativeDependencyImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/DerivativeDependencyImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/DerivativeDependencyImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/DerivativeDependencyImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/DerivativeUnknownImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/DerivativeUnknownImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/DerivativeUnknownImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/DerivativeUnknownImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIPortImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIPortImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIPortImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIPortImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIProfileFactoryImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIProfileFactoryImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIProfileFactoryImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIProfileFactoryImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIProfilePackageImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIProfilePackageImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIProfilePackageImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIProfilePackageImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMUImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMUImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMUImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMUImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/IndependentImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/IndependentImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/IndependentImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/IndependentImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/InitialUnknownDependencyImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/InitialUnknownDependencyImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/InitialUnknownDependencyImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/InitialUnknownDependencyImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/InitialUnknownImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/InitialUnknownImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/InitialUnknownImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/InitialUnknownImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/LocalImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/LocalImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/LocalImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/LocalImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ME_FMUImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ME_FMUImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ME_FMUImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ME_FMUImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/OutputDependencyImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/OutputDependencyImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/OutputDependencyImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/OutputDependencyImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/OutputUnknownImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/OutputUnknownImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/OutputUnknownImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/OutputUnknownImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ParameterImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ParameterImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ParameterImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ParameterImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/PortImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/PortImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/PortImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/PortImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ScalarVariableImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ScalarVariableImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ScalarVariableImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ScalarVariableImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/UnknownImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/UnknownImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/UnknownImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/UnknownImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/util/FMIProfileAdapterFactory.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/util/FMIProfileAdapterFactory.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/util/FMIProfileAdapterFactory.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/util/FMIProfileAdapterFactory.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/util/FMIProfileSwitch.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/util/FMIProfileSwitch.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/util/FMIProfileSwitch.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/util/FMIProfileSwitch.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomCS_FMU.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomCS_FMU.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomCS_FMU.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomCS_FMU.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomCalculatedParameter.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomCalculatedParameter.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomCalculatedParameter.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomCalculatedParameter.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMIPort.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMIPort.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMIPort.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMIPort.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMIProfileFactory.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMIProfileFactory.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMIProfileFactory.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMIProfileFactory.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMU.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMU.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMU.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMU.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomIndependant.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomIndependant.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomIndependant.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomIndependant.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomLocal.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomLocal.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomLocal.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomLocal.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomME_FMU.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomME_FMU.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomME_FMU.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomME_FMU.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomParameter.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomParameter.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomParameter.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomParameter.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomPort.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomPort.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomPort.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomPort.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/util/FMIProfileUtil.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/util/FMIProfileUtil.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/util/FMIProfileUtil.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/util/FMIProfileUtil.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/util/FastUMLUtil.java b/fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/util/FastUMLUtil.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/util/FastUMLUtil.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/util/FastUMLUtil.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/.classpath b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/.classpath
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/.classpath
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/.classpath
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/.project b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/.project
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/.project
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/.project
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/.pydevproject b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/.pydevproject
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/.pydevproject
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/.pydevproject
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/META-INF/MANIFEST.MF b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/META-INF/MANIFEST.MF
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/META-INF/MANIFEST.MF
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/about.html b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/about.html
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/about.html
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/about.html
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/build.properties b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/build.properties
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/build.properties
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/build.properties
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/css/ssptheme.css b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/css/ssptheme.css
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/css/ssptheme.css
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/css/ssptheme.css
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.elementtypesconfigurations b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.elementtypesconfigurations
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.elementtypesconfigurations
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.elementtypesconfigurations
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.profile.di b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.profile.di
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.profile.di
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.profile.di
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.profile.genmodel b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.profile.genmodel
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.profile.genmodel
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.profile.genmodel
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.profile.notation b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.profile.notation
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.profile.notation
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.profile.notation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.profile.uml b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.profile.uml
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.profile.uml
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.profile.uml
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulatorProfile.ecore b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulatorProfile.ecore
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulatorProfile.ecore
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulatorProfile.ecore
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/TLMLibrary.di b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/TLMLibrary.di
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/TLMLibrary.di
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/TLMLibrary.di
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/TLMLibrary.notation b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/TLMLibrary.notation
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/TLMLibrary.notation
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/TLMLibrary.notation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/TLMLibrary.uml b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/TLMLibrary.uml
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/TLMLibrary.uml
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/TLMLibrary.uml
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/model.profile.di b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/model.profile.di
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/model.profile.di
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/model.profile.di
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/model.profile.genmodel b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/model.profile.genmodel
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/model.profile.genmodel
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/model.profile.genmodel
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/model.profile.notation b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/model.profile.notation
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/model.profile.notation
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/model.profile.notation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/model.profile.uml b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/model.profile.uml
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/model.profile.uml
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/model.profile.uml
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/profile.ecore b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/profile.ecore
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/profile.ecore
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/profile.ecore
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/scripts/create_tlm_interfaces.py b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/scripts/create_tlm_interfaces.py
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/scripts/create_tlm_interfaces.py
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/scripts/create_tlm_interfaces.py
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/ssd_component_diagram_palette.paletteconfiguration b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/ssd_component_diagram_palette.paletteconfiguration
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/ssd_component_diagram_palette.paletteconfiguration
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/ssd_component_diagram_palette.paletteconfiguration
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/ssd_component_diagram_palette_Semantic.elementtypesconfigurations b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/ssd_component_diagram_palette_Semantic.elementtypesconfigurations
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/ssd_component_diagram_palette_Semantic.elementtypesconfigurations
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/ssd_component_diagram_palette_Semantic.elementtypesconfigurations
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/ssd_component_diagram_palette_UI.elementtypesconfigurations b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/ssd_component_diagram_palette_UI.elementtypesconfigurations
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/ssd_component_diagram_palette_UI.elementtypesconfigurations
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/model/ssd_component_diagram_palette_UI.elementtypesconfigurations
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/plugin.properties b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/plugin.properties
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/plugin.properties
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/plugin.properties
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/plugin.xml b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/plugin.xml
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/plugin.xml
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/plugin.xml
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/pom.xml b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/pom.xml
similarity index 91%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/pom.xml
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/pom.xml
index a6cc554..a6942c3 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/pom.xml
+++ b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/pom.xml
@@ -4,7 +4,7 @@
 
 	<!-- Parent POM (i.e., Language) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.language</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/BusConnectionEnd.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/BusConnectionEnd.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/BusConnectionEnd.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/BusConnectionEnd.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/BusConnector.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/BusConnector.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/BusConnector.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/BusConnector.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/Interpolation.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/Interpolation.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/Interpolation.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/Interpolation.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorBus.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorBus.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorBus.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorBus.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorFactory.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorFactory.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorFactory.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorFactory.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorPackage.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorPackage.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorPackage.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorPackage.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMConnection.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMConnection.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMConnection.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMConnection.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMDomain.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMDomain.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMDomain.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMDomain.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMInterfaceDefinition.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMInterfaceDefinition.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMInterfaceDefinition.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMInterfaceDefinition.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMSignal.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMSignal.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMSignal.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMSignal.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMSignalDefinition.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMSignalDefinition.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMSignalDefinition.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMSignalDefinition.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/BusConnectionEndImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/BusConnectionEndImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/BusConnectionEndImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/BusConnectionEndImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/BusConnectorImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/BusConnectorImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/BusConnectorImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/BusConnectorImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorBusImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorBusImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorBusImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorBusImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorFactoryImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorFactoryImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorFactoryImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorFactoryImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorPackageImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorPackageImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorPackageImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorPackageImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMConnectionImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMConnectionImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMConnectionImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMConnectionImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMInterfaceDefinitionImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMInterfaceDefinitionImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMInterfaceDefinitionImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMInterfaceDefinitionImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMSignalDefinitionImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMSignalDefinitionImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMSignalDefinitionImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMSignalDefinitionImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMSignalImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMSignalImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMSignalImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMSignalImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorAdapterFactory.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorAdapterFactory.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorAdapterFactory.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorAdapterFactory.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorSwitch.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorSwitch.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorSwitch.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorSwitch.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SSPProfileFactory.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SSPProfileFactory.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SSPProfileFactory.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SSPProfileFactory.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SSPProfilePackage.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SSPProfilePackage.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SSPProfilePackage.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SSPProfilePackage.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/Ssd.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/Ssd.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/Ssd.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/Ssd.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdComponent.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdComponent.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdComponent.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdComponent.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnection.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnection.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnection.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnection.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnector.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnector.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnector.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnector.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnectorAndFmiPort.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnectorAndFmiPort.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnectorAndFmiPort.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnectorAndFmiPort.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdElement.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdElement.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdElement.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdElement.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdSignalDictionaryReference.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdSignalDictionaryReference.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdSignalDictionaryReference.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdSignalDictionaryReference.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdSystem.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdSystem.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdSystem.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdSystem.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/TypeKind.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/TypeKind.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/TypeKind.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/TypeKind.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SSPProfileFactoryImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SSPProfileFactoryImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SSPProfileFactoryImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SSPProfileFactoryImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SSPProfilePackageImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SSPProfilePackageImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SSPProfilePackageImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SSPProfilePackageImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdComponentImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdComponentImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdComponentImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdComponentImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectionImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectionImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectionImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectionImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectorAndFmiPortImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectorAndFmiPortImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectorAndFmiPortImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectorAndFmiPortImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectorImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectorImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectorImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectorImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdElementImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdElementImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdElementImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdElementImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdSignalDictionaryReferenceImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdSignalDictionaryReferenceImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdSignalDictionaryReferenceImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdSignalDictionaryReferenceImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdSystemImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdSystemImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdSystemImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdSystemImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/util/SSPProfileAdapterFactory.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/util/SSPProfileAdapterFactory.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/util/SSPProfileAdapterFactory.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/util/SSPProfileAdapterFactory.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/util/SSPProfileSwitch.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/util/SSPProfileSwitch.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/util/SSPProfileSwitch.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/util/SSPProfileSwitch.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/edit/OMSimulatorBusEditHelper.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/edit/OMSimulatorBusEditHelper.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/edit/OMSimulatorBusEditHelper.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/edit/OMSimulatorBusEditHelper.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/operations/BusConnectorOperations.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/operations/BusConnectorOperations.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/operations/BusConnectorOperations.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/operations/BusConnectorOperations.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/operations/OMSimulatorBusOperations.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/operations/OMSimulatorBusOperations.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/operations/OMSimulatorBusOperations.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/operations/OMSimulatorBusOperations.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/operations/TLMInterfaceDefinitionOperations.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/operations/TLMInterfaceDefinitionOperations.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/operations/TLMInterfaceDefinitionOperations.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/operations/TLMInterfaceDefinitionOperations.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorProfileUtil.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorProfileUtil.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorProfileUtil.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorProfileUtil.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/validation/ClientSelector.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/validation/ClientSelector.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/validation/ClientSelector.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/validation/ClientSelector.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/validation/ConnectorConstraint.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/validation/ConnectorConstraint.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/validation/ConnectorConstraint.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/validation/ConnectorConstraint.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/StereotypeStrings.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/StereotypeStrings.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/StereotypeStrings.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/StereotypeStrings.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSSPProfileFactoryImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSSPProfileFactoryImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSSPProfileFactoryImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSSPProfileFactoryImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectionImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectionImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectionImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectionImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnector.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnector.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnector.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnector.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectorAndFmiPortImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectorAndFmiPortImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectorAndFmiPortImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectorAndFmiPortImpl.java
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectorTypeImpl.java b/fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectorTypeImpl.java
similarity index 100%
rename from bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectorTypeImpl.java
rename to fmi/bundles/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectorTypeImpl.java
diff --git a/bundles/fmi/language/pom.xml b/fmi/bundles/language/pom.xml
similarity index 84%
rename from bundles/fmi/language/pom.xml
rename to fmi/bundles/language/pom.xml
index 5ab679b..08d7b5e 100644
--- a/bundles/fmi/language/pom.xml
+++ b/fmi/bundles/language/pom.xml
@@ -7,8 +7,8 @@
 	<!-- Parent POM (i.e., Bundles) -->
 	<parent>
 		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.fmi.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
+		<artifactId>org.eclipse.papyrus.moka.fmi.bundles.root</artifactId>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/.classpath b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/.classpath
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/.classpath
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/.classpath
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/.project b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/.project
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/.project
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/.project
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/.pydevproject b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/.pydevproject
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/.pydevproject
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/.pydevproject
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/META-INF/MANIFEST.MF b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/META-INF/MANIFEST.MF
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/META-INF/MANIFEST.MF
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/about.html b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/about.html
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/about.html
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/about.html
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/build.properties b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/build.properties
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/build.properties
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/build.properties
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/plugin.xml b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/plugin.xml
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/plugin.xml
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/plugin.xml
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/pom.xml b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/pom.xml
similarity index 80%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/pom.xml
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/pom.xml
index e4a9a13..607a754 100644
--- a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/pom.xml
+++ b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/pom.xml
@@ -3,8 +3,8 @@
 
 	<!-- Parent POM (i.e., the one owned by the releng folder) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.fmi.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
+		<artifactId>org.eclipse.papyrus.moka.fmi.bundles.root</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/FMIModule.java b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/FMIModule.java
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/FMIModule.java
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/FMIModule.java
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/ModelDescriptionGenerator.java b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/ModelDescriptionGenerator.java
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/ModelDescriptionGenerator.java
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/ModelDescriptionGenerator.java
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/AbstractConnectorHandler.java b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/AbstractConnectorHandler.java
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/AbstractConnectorHandler.java
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/AbstractConnectorHandler.java
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/AbstractPortHandler.java b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/AbstractPortHandler.java
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/AbstractPortHandler.java
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/AbstractPortHandler.java
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/BusConnectorHandler.java b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/BusConnectorHandler.java
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/BusConnectorHandler.java
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/BusConnectorHandler.java
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/ConnectorHandler.java b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/ConnectorHandler.java
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/ConnectorHandler.java
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/ConnectorHandler.java
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/FMIBusHandler.java b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/FMIBusHandler.java
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/FMIBusHandler.java
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/FMIBusHandler.java
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/FMIPortHandler.java b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/FMIPortHandler.java
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/FMIPortHandler.java
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/FMIPortHandler.java
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/FMISimulatorHandler.java b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/FMISimulatorHandler.java
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/FMISimulatorHandler.java
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/FMISimulatorHandler.java
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/FMUHandler.java b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/FMUHandler.java
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/FMUHandler.java
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/FMUHandler.java
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/FMUInstanceHandler.java b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/FMUInstanceHandler.java
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/FMUInstanceHandler.java
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/FMUInstanceHandler.java
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/GraphicalElement.java b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/GraphicalElement.java
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/GraphicalElement.java
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/GraphicalElement.java
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/GraphicalElementUtils.java b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/GraphicalElementUtils.java
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/GraphicalElementUtils.java
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/GraphicalElementUtils.java
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/IConnectorHandler.java b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/IConnectorHandler.java
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/IConnectorHandler.java
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/IConnectorHandler.java
diff --git a/bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/SubConnectorHandler.java b/fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/SubConnectorHandler.java
similarity index 100%
rename from bundles/fmi/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/SubConnectorHandler.java
rename to fmi/bundles/org.eclipse.papyrus.moka.fmi.ease/src/org/eclipse/papyrus/ease/fmi/SubConnectorHandler.java
diff --git a/bundles/fmi/pom.xml b/fmi/bundles/pom.xml
similarity index 75%
rename from bundles/fmi/pom.xml
rename to fmi/bundles/pom.xml
index 273ce49..54f4ae7 100644
--- a/bundles/fmi/pom.xml
+++ b/fmi/bundles/pom.xml
@@ -7,12 +7,12 @@
 	<!-- Parent of this POM -->
 	<parent>
 		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.bundles.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
+		<artifactId>org.eclipse.papyrus.moka.fmi.root</artifactId>
 	</parent>
 
 	<!-- Moka project root POM (aggregator) -->
-	<artifactId>org.eclipse.papyrus.moka.incubation.fmi.root</artifactId>
+	<artifactId>org.eclipse.papyrus.moka.fmi.bundles.root</artifactId>
 	<name>Moka Incubation FMI</name>
 	<packaging>pom</packaging>
 
@@ -23,7 +23,7 @@
 		<module>tools</module>
 		<module>ui</module>
 		<!--<module>org.eclipse.papyrus.moka.fmi.ease</module> -->
-		<module>products</module>
+		<!--module>products</module-->
 	</modules>
 
 </project>
diff --git a/bundles/fmi/products/org.eclipse.papyrus.moka.fmu.product/.classpath b/fmi/bundles/products/org.eclipse.papyrus.moka.fmu.product/.classpath
similarity index 100%
rename from bundles/fmi/products/org.eclipse.papyrus.moka.fmu.product/.classpath
rename to fmi/bundles/products/org.eclipse.papyrus.moka.fmu.product/.classpath
diff --git a/bundles/fmi/products/org.eclipse.papyrus.moka.fmu.product/.project b/fmi/bundles/products/org.eclipse.papyrus.moka.fmu.product/.project
similarity index 100%
rename from bundles/fmi/products/org.eclipse.papyrus.moka.fmu.product/.project
rename to fmi/bundles/products/org.eclipse.papyrus.moka.fmu.product/.project
diff --git a/bundles/fmi/products/org.eclipse.papyrus.moka.fmu.product/META-INF/MANIFEST.MF b/fmi/bundles/products/org.eclipse.papyrus.moka.fmu.product/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/fmi/products/org.eclipse.papyrus.moka.fmu.product/META-INF/MANIFEST.MF
rename to fmi/bundles/products/org.eclipse.papyrus.moka.fmu.product/META-INF/MANIFEST.MF
diff --git a/bundles/fmi/products/org.eclipse.papyrus.moka.fmu.product/about.html b/fmi/bundles/products/org.eclipse.papyrus.moka.fmu.product/about.html
similarity index 100%
rename from bundles/fmi/products/org.eclipse.papyrus.moka.fmu.product/about.html
rename to fmi/bundles/products/org.eclipse.papyrus.moka.fmu.product/about.html
diff --git a/bundles/fmi/products/org.eclipse.papyrus.moka.fmu.product/build.properties b/fmi/bundles/products/org.eclipse.papyrus.moka.fmu.product/build.properties
similarity index 100%
rename from bundles/fmi/products/org.eclipse.papyrus.moka.fmu.product/build.properties
rename to fmi/bundles/products/org.eclipse.papyrus.moka.fmu.product/build.properties
diff --git a/bundles/fmi/products/org.eclipse.papyrus.moka.fmu.product/fmu_rcp.product b/fmi/bundles/products/org.eclipse.papyrus.moka.fmu.product/fmu_rcp.product
similarity index 100%
rename from bundles/fmi/products/org.eclipse.papyrus.moka.fmu.product/fmu_rcp.product
rename to fmi/bundles/products/org.eclipse.papyrus.moka.fmu.product/fmu_rcp.product
diff --git a/bundles/fmi/products/org.eclipse.papyrus.moka.fmu.product/pom.xml b/fmi/bundles/products/org.eclipse.papyrus.moka.fmu.product/pom.xml
similarity index 98%
rename from bundles/fmi/products/org.eclipse.papyrus.moka.fmu.product/pom.xml
rename to fmi/bundles/products/org.eclipse.papyrus.moka.fmu.product/pom.xml
index b26bb77..f704815 100644
--- a/bundles/fmi/products/org.eclipse.papyrus.moka.fmu.product/pom.xml
+++ b/fmi/bundles/products/org.eclipse.papyrus.moka.fmu.product/pom.xml
@@ -4,7 +4,7 @@
 
 	<!-- Parent POM (i.e., the one owned by the releng folder) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
 		<artifactId>org.eclipse.papyrus.moka.fmu.product.root</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
diff --git a/bundles/fmi/products/pom.xml b/fmi/bundles/products/pom.xml
similarity index 83%
rename from bundles/fmi/products/pom.xml
rename to fmi/bundles/products/pom.xml
index 96ec9df..57a68bc 100644
--- a/bundles/fmi/products/pom.xml
+++ b/fmi/bundles/products/pom.xml
@@ -7,8 +7,8 @@
 	<!-- Parent POM (i.e., Bundles) -->
 	<parent>
 		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.fmi.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
+		<artifactId>org.eclipse.papyrus.moka.fmi.bundles.root</artifactId>
 	</parent>
 
 	<!-- POM Description -->
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/.classpath b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/.classpath
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/.classpath
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/.classpath
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/.project b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/.project
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/.project
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/.project
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/META-INF/MANIFEST.MF b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/META-INF/MANIFEST.MF
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/META-INF/MANIFEST.MF
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/about.html b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/about.html
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/about.html
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/about.html
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/build.properties b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/build.properties
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/build.properties
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/build.properties
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/pom.xml b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/pom.xml
similarity index 91%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/pom.xml
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/pom.xml
index d75efd5..25cc2ee 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/pom.xml
+++ b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/pom.xml
@@ -4,7 +4,7 @@
 
 	<!-- Parent POM (i.e., Tools) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.tools</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/Activator.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/Activator.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/Activator.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/Activator.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/FMI2UML.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/FMI2UML.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/FMI2UML.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/FMI2UML.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/FMU2UMLTransformation.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/FMU2UMLTransformation.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/FMU2UMLTransformation.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/FMU2UMLTransformation.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/.classpath b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/.classpath
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/.classpath
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/.classpath
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/.project b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/.project
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/.project
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/.project
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/META-INF/MANIFEST.MF b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/META-INF/MANIFEST.MF
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/META-INF/MANIFEST.MF
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/about.html b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/about.html
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/about.html
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/about.html
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/build.properties b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/build.properties
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/build.properties
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/build.properties
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_16x16.jpg b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_16x16.jpg
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_16x16.jpg
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_16x16.jpg
Binary files differ
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_16x16.png b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_16x16.png
similarity index 98%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_16x16.png
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_16x16.png
index 06c8645..1e4862c 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_16x16.png
+++ b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_16x16.png
Binary files differ
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_16x16_32x32.svg b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_16x16_32x32.svg
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_16x16_32x32.svg
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_16x16_32x32.svg
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_32x32.jpg b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_32x32.jpg
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_32x32.jpg
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_32x32.jpg
Binary files differ
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_32x32.png b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_32x32.png
similarity index 99%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_32x32.png
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_32x32.png
index 70ab53f..68e2586 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_32x32.png
+++ b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMI_32x32.png
Binary files differ
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMU_16x16.jpg b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMU_16x16.jpg
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMU_16x16.jpg
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMU_16x16.jpg
Binary files differ
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMU_16x16.png b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMU_16x16.png
similarity index 98%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMU_16x16.png
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMU_16x16.png
index fc6c758..4716121 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMU_16x16.png
+++ b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMU_16x16.png
Binary files differ
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMU_32x32.jpg b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMU_32x32.jpg
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMU_32x32.jpg
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMU_32x32.jpg
Binary files differ
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMU_32x32.png b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMU_32x32.png
similarity index 99%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMU_32x32.png
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMU_32x32.png
index d45e0a8..6f154a9 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMU_32x32.png
+++ b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/FMU_32x32.png
Binary files differ
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/fmu.ico b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/fmu.ico
similarity index 99%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/fmu.ico
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/fmu.ico
index 93e4492..d066dd8 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/fmu.ico
+++ b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/fmu.ico
Binary files differ
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/logotype_FMU_vertical_RVB.svg b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/logotype_FMU_vertical_RVB.svg
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/logotype_FMU_vertical_RVB.svg
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/icons/logotype_FMU_vertical_RVB.svg
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/plugin.xml b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/plugin.xml
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/plugin.xml
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/plugin.xml
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/pom.xml b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/pom.xml
similarity index 91%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/pom.xml
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/pom.xml
index 6747b5e..c6a87cf 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/pom.xml
+++ b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/pom.xml
@@ -4,7 +4,7 @@
 
 	<!-- Parent POM (i.e., Tools) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.tools</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/OMSimulator.ctx b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/OMSimulator.ctx
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/OMSimulator.ctx
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/OMSimulator.ctx
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleBusConnectionEnd.xwt b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleBusConnectionEnd.xwt
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleBusConnectionEnd.xwt
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleBusConnectionEnd.xwt
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleBusConnector.xwt b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleBusConnector.xwt
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleBusConnector.xwt
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleBusConnector.xwt
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleOMSimulatorBus.xwt b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleOMSimulatorBus.xwt
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleOMSimulatorBus.xwt
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleOMSimulatorBus.xwt
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleTLMConnection.xwt b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleTLMConnection.xwt
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleTLMConnection.xwt
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleTLMConnection.xwt
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleTLMInterfaceDefinition.xwt b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleTLMInterfaceDefinition.xwt
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleTLMInterfaceDefinition.xwt
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleTLMInterfaceDefinition.xwt
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleTLMSignal.xwt b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleTLMSignal.xwt
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleTLMSignal.xwt
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleTLMSignal.xwt
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleTLMSignalDefinition.xwt b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleTLMSignalDefinition.xwt
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleTLMSignalDefinition.xwt
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/MultipleTLMSignalDefinition.xwt
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleBusConnectionEnd.xwt b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleBusConnectionEnd.xwt
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleBusConnectionEnd.xwt
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleBusConnectionEnd.xwt
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleBusConnector.xwt b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleBusConnector.xwt
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleBusConnector.xwt
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleBusConnector.xwt
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleOMSimulatorBus.xwt b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleOMSimulatorBus.xwt
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleOMSimulatorBus.xwt
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleOMSimulatorBus.xwt
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleTLMConnection.xwt b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleTLMConnection.xwt
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleTLMConnection.xwt
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleTLMConnection.xwt
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleTLMInterfaceDefinition.xwt b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleTLMInterfaceDefinition.xwt
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleTLMInterfaceDefinition.xwt
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleTLMInterfaceDefinition.xwt
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleTLMSignal.xwt b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleTLMSignal.xwt
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleTLMSignal.xwt
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleTLMSignal.xwt
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleTLMSignalDefinition.xwt b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleTLMSignalDefinition.xwt
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleTLMSignalDefinition.xwt
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/properties/ui/SingleTLMSignalDefinition.xwt
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/src/org/eclipse/papyrus/moka/fmi/profile/ui/Activator.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/src/org/eclipse/papyrus/moka/fmi/profile/ui/Activator.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/src/org/eclipse/papyrus/moka/fmi/profile/ui/Activator.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.profile.ui/src/org/eclipse/papyrus/moka/fmi/profile/ui/Activator.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/.classpath b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.rcp.export/.classpath
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/.classpath
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.rcp.export/.classpath
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/.project b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.rcp.export/.project
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/.project
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.rcp.export/.project
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/META-INF/MANIFEST.MF b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.rcp.export/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/META-INF/MANIFEST.MF
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.rcp.export/META-INF/MANIFEST.MF
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/about.html b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.rcp.export/about.html
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/about.html
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.rcp.export/about.html
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/build.properties b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.rcp.export/build.properties
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/build.properties
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.rcp.export/build.properties
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/pom.xml b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.rcp.export/pom.xml
similarity index 87%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/pom.xml
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.rcp.export/pom.xml
index 49fa94c..812cb5e 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/pom.xml
+++ b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.rcp.export/pom.xml
@@ -4,7 +4,7 @@
 
 	<!-- Parent POM (i.e., Tools) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.tools</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
@@ -17,7 +17,7 @@
 	
 	<dependencies>
 		<dependency>
-			<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+			<groupId>org.eclipse.papyrus.moka.fmi</groupId>
 			<artifactId>org.eclipse.papyrus.moka.fmu.product</artifactId>
 			<version>0.7.0-SNAPSHOT</version>
 			<type>eclipse-repository</type>
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/resources/rcp.md b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.rcp.export/resources/rcp.md
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/resources/rcp.md
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi.rcp.export/resources/rcp.md
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/.classpath b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/.classpath
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/.classpath
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/.classpath
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/.gitignore b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/.gitignore
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/.gitignore
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/.gitignore
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/.project b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/.project
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/.project
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/.project
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/META-INF/MANIFEST.MF b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/META-INF/MANIFEST.MF
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/META-INF/MANIFEST.MF
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/about.html b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/about.html
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/about.html
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/about.html
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/build.properties b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/build.properties
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/build.properties
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/build.properties
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/Fmi2ModelDescription.ecore b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/model/Fmi2ModelDescription.ecore
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/Fmi2ModelDescription.ecore
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/model/Fmi2ModelDescription.ecore
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/Fmi2ModelDescription.genmodel b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/model/Fmi2ModelDescription.genmodel
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/Fmi2ModelDescription.genmodel
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/model/Fmi2ModelDescription.genmodel
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/ModelDescriptionProxy.di b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/model/ModelDescriptionProxy.di
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/ModelDescriptionProxy.di
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/model/ModelDescriptionProxy.di
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/ModelDescriptionProxy.notation b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/model/ModelDescriptionProxy.notation
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/ModelDescriptionProxy.notation
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/model/ModelDescriptionProxy.notation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/ModelDescriptionProxy.uml b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/model/ModelDescriptionProxy.uml
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/ModelDescriptionProxy.uml
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/model/ModelDescriptionProxy.uml
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.di b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.di
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.di
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.di
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.ecore b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.ecore
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.ecore
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.ecore
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.genmodel b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.genmodel
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.genmodel
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.genmodel
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.notation b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.notation
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.notation
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.notation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.uml b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.uml
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.uml
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.uml
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/plugin.properties b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/plugin.properties
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/plugin.properties
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/plugin.properties
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/plugin.xml b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/plugin.xml
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/plugin.xml
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/plugin.xml
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/pom.xml b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/pom.xml
similarity index 91%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/pom.xml
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/pom.xml
index 7a91e7b..9fe82c3 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/pom.xml
+++ b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/pom.xml
@@ -4,7 +4,7 @@
 
 	<!-- Parent POM (i.e., Tools) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.tools</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2Annotation.xsd b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2Annotation.xsd
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2Annotation.xsd
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2Annotation.xsd
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2AttributeGroups.xsd b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2AttributeGroups.xsd
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2AttributeGroups.xsd
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2AttributeGroups.xsd
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2ModelDescription.xsd b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2ModelDescription.xsd
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2ModelDescription.xsd
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2ModelDescription.xsd
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2ScalarVariable.xsd b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2ScalarVariable.xsd
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2ScalarVariable.xsd
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2ScalarVariable.xsd
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2Type.xsd b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2Type.xsd
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2Type.xsd
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2Type.xsd
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2Unit.xsd b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2Unit.xsd
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2Unit.xsd
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2Unit.xsd
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2VariableDependency.xsd b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2VariableDependency.xsd
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2VariableDependency.xsd
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/schema/fmi2VariableDependency.xsd
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/AbstractFile.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/AbstractFile.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/AbstractFile.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/AbstractFile.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/ArchiveToUnzipInFMU.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/ArchiveToUnzipInFMU.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/ArchiveToUnzipInFMU.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/ArchiveToUnzipInFMU.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FMUBundle.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FMUBundle.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FMUBundle.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FMUBundle.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FmumetamodelFactory.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FmumetamodelFactory.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FmumetamodelFactory.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FmumetamodelFactory.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FmumetamodelPackage.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FmumetamodelPackage.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FmumetamodelPackage.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FmumetamodelPackage.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FolderToCreateInFMU.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FolderToCreateInFMU.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FolderToCreateInFMU.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FolderToCreateInFMU.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/JavaFileProxy.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/JavaFileProxy.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/JavaFileProxy.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/JavaFileProxy.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/AbstractFileImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/AbstractFileImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/AbstractFileImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/AbstractFileImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/ArchiveToUnzipInFMUImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/ArchiveToUnzipInFMUImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/ArchiveToUnzipInFMUImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/ArchiveToUnzipInFMUImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FMUBundleImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FMUBundleImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FMUBundleImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FMUBundleImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FmumetamodelFactoryImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FmumetamodelFactoryImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FmumetamodelFactoryImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FmumetamodelFactoryImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FmumetamodelPackageImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FmumetamodelPackageImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FmumetamodelPackageImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FmumetamodelPackageImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FolderToCreateInFMUImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FolderToCreateInFMUImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FolderToCreateInFMUImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FolderToCreateInFMUImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/JavaFileProxyImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/JavaFileProxyImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/JavaFileProxyImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/JavaFileProxyImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/util/FmumetamodelAdapterFactory.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/util/FmumetamodelAdapterFactory.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/util/FmumetamodelAdapterFactory.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/util/FmumetamodelAdapterFactory.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/util/FmumetamodelSwitch.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/util/FmumetamodelSwitch.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/util/FmumetamodelSwitch.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/util/FmumetamodelSwitch.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/BaseUnitType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/BaseUnitType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/BaseUnitType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/BaseUnitType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/BooleanType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/BooleanType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/BooleanType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/BooleanType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CategoryType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CategoryType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CategoryType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CategoryType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CausalityType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CausalityType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CausalityType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CausalityType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CoSimulationType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CoSimulationType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CoSimulationType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CoSimulationType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DefaultExperimentType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DefaultExperimentType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DefaultExperimentType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DefaultExperimentType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DependenciesKindTypeItem.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DependenciesKindTypeItem.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DependenciesKindTypeItem.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DependenciesKindTypeItem.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DependenciesKindTypeItem1.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DependenciesKindTypeItem1.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DependenciesKindTypeItem1.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DependenciesKindTypeItem1.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DisplayUnitType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DisplayUnitType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DisplayUnitType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DisplayUnitType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DocumentRoot.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DocumentRoot.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DocumentRoot.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DocumentRoot.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/EnumerationType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/EnumerationType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/EnumerationType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/EnumerationType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/EnumerationType1.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/EnumerationType1.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/EnumerationType1.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/EnumerationType1.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FileType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FileType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FileType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FileType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FileType1.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FileType1.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FileType1.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FileType1.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2Annotation.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2Annotation.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2Annotation.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2Annotation.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2ScalarVariable.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2ScalarVariable.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2ScalarVariable.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2ScalarVariable.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2SimpleType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2SimpleType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2SimpleType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2SimpleType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2Unit.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2Unit.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2Unit.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2Unit.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2VariableDependency.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2VariableDependency.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2VariableDependency.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2VariableDependency.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiFactory.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiFactory.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiFactory.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiFactory.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiModelDescriptionType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiModelDescriptionType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiModelDescriptionType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiModelDescriptionType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiPackage.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiPackage.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiPackage.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiPackage.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/InitialType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/InitialType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/InitialType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/InitialType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/InitialUnknownsType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/InitialUnknownsType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/InitialUnknownsType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/InitialUnknownsType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/IntegerType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/IntegerType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/IntegerType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/IntegerType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/IntegerType1.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/IntegerType1.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/IntegerType1.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/IntegerType1.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ItemType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ItemType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ItemType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ItemType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/LogCategoriesType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/LogCategoriesType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/LogCategoriesType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/LogCategoriesType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelExchangeType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelExchangeType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelExchangeType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelExchangeType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelStructureType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelStructureType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelStructureType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelStructureType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelVariablesType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelVariablesType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelVariablesType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelVariablesType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/RealType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/RealType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/RealType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/RealType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/RealType1.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/RealType1.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/RealType1.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/RealType1.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/SourceFilesType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/SourceFilesType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/SourceFilesType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/SourceFilesType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/SourceFilesType1.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/SourceFilesType1.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/SourceFilesType1.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/SourceFilesType1.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/StringType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/StringType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/StringType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/StringType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ToolType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ToolType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ToolType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ToolType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/TypeDefinitionsType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/TypeDefinitionsType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/TypeDefinitionsType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/TypeDefinitionsType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnitDefinitionsType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnitDefinitionsType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnitDefinitionsType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnitDefinitionsType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnknownType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnknownType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnknownType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnknownType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnknownType1.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnknownType1.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnknownType1.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnknownType1.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/VariabilityType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/VariabilityType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/VariabilityType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/VariabilityType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/VariableNamingConventionType.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/VariableNamingConventionType.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/VariableNamingConventionType.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/VariableNamingConventionType.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/BaseUnitTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/BaseUnitTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/BaseUnitTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/BaseUnitTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/BooleanTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/BooleanTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/BooleanTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/BooleanTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/CategoryTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/CategoryTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/CategoryTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/CategoryTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/CoSimulationTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/CoSimulationTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/CoSimulationTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/CoSimulationTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DefaultExperimentTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DefaultExperimentTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DefaultExperimentTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DefaultExperimentTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DisplayUnitTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DisplayUnitTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DisplayUnitTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DisplayUnitTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DocumentRootImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DocumentRootImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DocumentRootImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DocumentRootImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/EnumerationType1Impl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/EnumerationType1Impl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/EnumerationType1Impl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/EnumerationType1Impl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/EnumerationTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/EnumerationTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/EnumerationTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/EnumerationTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FileType1Impl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FileType1Impl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FileType1Impl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FileType1Impl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FileTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FileTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FileTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FileTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2AnnotationImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2AnnotationImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2AnnotationImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2AnnotationImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2ScalarVariableImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2ScalarVariableImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2ScalarVariableImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2ScalarVariableImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2SimpleTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2SimpleTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2SimpleTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2SimpleTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2UnitImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2UnitImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2UnitImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2UnitImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2VariableDependencyImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2VariableDependencyImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2VariableDependencyImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2VariableDependencyImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiFactoryImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiFactoryImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiFactoryImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiFactoryImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiModelDescriptionTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiModelDescriptionTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiModelDescriptionTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiModelDescriptionTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiPackageImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiPackageImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiPackageImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiPackageImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/InitialUnknownsTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/InitialUnknownsTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/InitialUnknownsTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/InitialUnknownsTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/IntegerType1Impl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/IntegerType1Impl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/IntegerType1Impl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/IntegerType1Impl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/IntegerTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/IntegerTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/IntegerTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/IntegerTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ItemTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ItemTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ItemTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ItemTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/LogCategoriesTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/LogCategoriesTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/LogCategoriesTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/LogCategoriesTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelExchangeTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelExchangeTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelExchangeTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelExchangeTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelStructureTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelStructureTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelStructureTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelStructureTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelVariablesTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelVariablesTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelVariablesTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelVariablesTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/RealType1Impl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/RealType1Impl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/RealType1Impl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/RealType1Impl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/RealTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/RealTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/RealTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/RealTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/SourceFilesType1Impl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/SourceFilesType1Impl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/SourceFilesType1Impl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/SourceFilesType1Impl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/SourceFilesTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/SourceFilesTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/SourceFilesTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/SourceFilesTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/StringTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/StringTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/StringTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/StringTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ToolTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ToolTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ToolTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ToolTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/TypeDefinitionsTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/TypeDefinitionsTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/TypeDefinitionsTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/TypeDefinitionsTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnitDefinitionsTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnitDefinitionsTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnitDefinitionsTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnitDefinitionsTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnknownType1Impl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnknownType1Impl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnknownType1Impl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnknownType1Impl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnknownTypeImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnknownTypeImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnknownTypeImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnknownTypeImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiAdapterFactory.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiAdapterFactory.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiAdapterFactory.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiAdapterFactory.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiResourceFactoryImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiResourceFactoryImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiResourceFactoryImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiResourceFactoryImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiResourceImpl.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiResourceImpl.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiResourceImpl.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiResourceImpl.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiSwitch.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiSwitch.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiSwitch.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiSwitch.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiValidator.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiValidator.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiValidator.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiValidator.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiXMLProcessor.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiXMLProcessor.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiXMLProcessor.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiXMLProcessor.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/Activator.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/Activator.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/Activator.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/Activator.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUParser.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUParser.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUParser.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUParser.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUResource.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUResource.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUResource.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUResource.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUResourceFactory.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUResourceFactory.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUResourceFactory.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUResourceFactory.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMIOSDetector.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMIOSDetector.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMIOSDetector.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMIOSDetector.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMIUtil.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMIUtil.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMIUtil.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMIUtil.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMUResourceUtil.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMUResourceUtil.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMUResourceUtil.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMUResourceUtil.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/UnzipUtility.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/UnzipUtility.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/UnzipUtility.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/UnzipUtility.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/.classpath b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/.classpath
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/.classpath
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/.classpath
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/.project b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/.project
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/.project
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/.project
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/META-INF/MANIFEST.MF b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/META-INF/MANIFEST.MF
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/META-INF/MANIFEST.MF
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/about.html b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/about.html
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/about.html
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/about.html
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/build.properties b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/build.properties
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/build.properties
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/build.properties
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/builds/.gitignore b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/builds/.gitignore
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/builds/.gitignore
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/builds/.gitignore
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/debug rcp - embedded.launch b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/debug rcp - embedded.launch
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/debug rcp - embedded.launch
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/debug rcp - embedded.launch
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/debug rcp.launch b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/debug rcp.launch
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/debug rcp.launch
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/debug rcp.launch
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/plugin.xml b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/plugin.xml
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/plugin.xml
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/plugin.xml
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/pom.xml b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/pom.xml
similarity index 91%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/pom.xml
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/pom.xml
index 78ea078..4542b4c 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/pom.xml
+++ b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/pom.xml
@@ -4,7 +4,7 @@
 
 	<!-- Parent POM (i.e., Tools) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.tools</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/src/org/eclipse/papyrus/moka/fmu/rcp/FMURCPApplication.java b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/src/org/eclipse/papyrus/moka/fmu/rcp/FMURCPApplication.java
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/src/org/eclipse/papyrus/moka/fmu/rcp/FMURCPApplication.java
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/src/org/eclipse/papyrus/moka/fmu/rcp/FMURCPApplication.java
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/test/fmu/modelDescription.xml b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/test/fmu/modelDescription.xml
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/test/fmu/modelDescription.xml
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/test/fmu/modelDescription.xml
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/test/fmu/resources/TankBarrelExample.di b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/test/fmu/resources/TankBarrelExample.di
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/test/fmu/resources/TankBarrelExample.di
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/test/fmu/resources/TankBarrelExample.di
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/test/fmu/resources/TankBarrelExample.notation b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/test/fmu/resources/TankBarrelExample.notation
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/test/fmu/resources/TankBarrelExample.notation
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/test/fmu/resources/TankBarrelExample.notation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/test/fmu/resources/TankBarrelExample.uml b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/test/fmu/resources/TankBarrelExample.uml
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/test/fmu/resources/TankBarrelExample.uml
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/test/fmu/resources/TankBarrelExample.uml
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/test/fmu/resources/moka.properties b/fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/test/fmu/resources/moka.properties
similarity index 100%
rename from bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/test/fmu/resources/moka.properties
rename to fmi/bundles/tools/org.eclipse.papyrus.moka.fmu.rcp/test/fmu/resources/moka.properties
diff --git a/bundles/fmi/tools/pom.xml b/fmi/bundles/tools/pom.xml
similarity index 86%
rename from bundles/fmi/tools/pom.xml
rename to fmi/bundles/tools/pom.xml
index fe20652..2734b1c 100644
--- a/bundles/fmi/tools/pom.xml
+++ b/fmi/bundles/tools/pom.xml
@@ -8,8 +8,8 @@
 	<!-- Parent POM (i.e., FMI) -->
 	<parent>
 		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.fmi.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
+		<artifactId>org.eclipse.papyrus.moka.fmi.bundles.root</artifactId>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/.classpath b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/.classpath
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/.classpath
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/.classpath
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/.project b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/.project
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/.project
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/.project
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/META-INF/MANIFEST.MF b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/META-INF/MANIFEST.MF
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/META-INF/MANIFEST.MF
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/about.html b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/about.html
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/about.html
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/about.html
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/build.properties b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/build.properties
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/build.properties
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/build.properties
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/css/FMIStyle.css b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/css/FMIStyle.css
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/css/FMIStyle.css
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/css/FMIStyle.css
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/icons/moka_icon.png b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/icons/moka_icon.png
similarity index 98%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/icons/moka_icon.png
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/icons/moka_icon.png
index 6739135..9bd13cf 100644
--- a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/icons/moka_icon.png
+++ b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/icons/moka_icon.png
Binary files differ
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/models/examples/TutoFMU.di b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/models/examples/TutoFMU.di
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/models/examples/TutoFMU.di
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/models/examples/TutoFMU.di
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/models/examples/TutoFMU.notation b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/models/examples/TutoFMU.notation
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/models/examples/TutoFMU.notation
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/models/examples/TutoFMU.notation
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/models/examples/TutoFMU.uml b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/models/examples/TutoFMU.uml
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/models/examples/TutoFMU.uml
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/models/examples/TutoFMU.uml
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/plugin.xml b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/plugin.xml
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/plugin.xml
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/plugin.xml
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/pom.xml b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/pom.xml
similarity index 91%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/pom.xml
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/pom.xml
index 1dbb70b..147e80c 100644
--- a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/pom.xml
+++ b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/pom.xml
@@ -7,7 +7,7 @@
 	
 	<!-- Parent POM (i.e., UI) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
 		<artifactId>org.eclipse.papyrus.moka.bundles.fmi.ui</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/Activator.java b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/Activator.java
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/Activator.java
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/Activator.java
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/ConnectPortViewsCommand.java b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/ConnectPortViewsCommand.java
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/ConnectPortViewsCommand.java
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/ConnectPortViewsCommand.java
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/DropFMUAsPartCommand.java b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/DropFMUAsPartCommand.java
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/DropFMUAsPartCommand.java
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/DropFMUAsPartCommand.java
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/DropFMUPartCommand.java b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/DropFMUPartCommand.java
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/DropFMUPartCommand.java
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/DropFMUPartCommand.java
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/GroupPortCommand.java b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/GroupPortCommand.java
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/GroupPortCommand.java
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/GroupPortCommand.java
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/UpdateFMUTypeCommand.java b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/UpdateFMUTypeCommand.java
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/UpdateFMUTypeCommand.java
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/UpdateFMUTypeCommand.java
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/AbstractFMIDialog.java b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/AbstractFMIDialog.java
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/AbstractFMIDialog.java
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/AbstractFMIDialog.java
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/ExportFMUDialog.java b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/ExportFMUDialog.java
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/ExportFMUDialog.java
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/ExportFMUDialog.java
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/ImportFMUDialog.java b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/ImportFMUDialog.java
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/ImportFMUDialog.java
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/ImportFMUDialog.java
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dnd/FMUToPartDropStrategy.java b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dnd/FMUToPartDropStrategy.java
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dnd/FMUToPartDropStrategy.java
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dnd/FMUToPartDropStrategy.java
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/handlers/GroupPortsHanlder.java b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/handlers/GroupPortsHanlder.java
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/handlers/GroupPortsHanlder.java
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/handlers/GroupPortsHanlder.java
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/handlers/ImportFMULibHandler.java b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/handlers/ImportFMULibHandler.java
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/handlers/ImportFMULibHandler.java
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/handlers/ImportFMULibHandler.java
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/util/FMUPortHelper.java b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/util/FMUPortHelper.java
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/util/FMUPortHelper.java
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/util/FMUPortHelper.java
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/util/FMUViewUtil.java b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/util/FMUViewUtil.java
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/util/FMUViewUtil.java
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/util/FMUViewUtil.java
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/util/GroupPortUtils.java b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/util/GroupPortUtils.java
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/util/GroupPortUtils.java
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/util/GroupPortUtils.java
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/wizards/FMUTutoWizard.java b/fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/wizards/FMUTutoWizard.java
similarity index 100%
rename from bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/wizards/FMUTutoWizard.java
rename to fmi/bundles/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/wizards/FMUTutoWizard.java
diff --git a/bundles/fmi/ui/pom.xml b/fmi/bundles/ui/pom.xml
similarity index 83%
rename from bundles/fmi/ui/pom.xml
rename to fmi/bundles/ui/pom.xml
index 7c9a1ee..f74942e 100644
--- a/bundles/fmi/ui/pom.xml
+++ b/fmi/bundles/ui/pom.xml
@@ -8,8 +8,8 @@
 	<!-- Parent POM (i.e., FMI) -->
 	<parent>
 		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.fmi.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
+		<artifactId>org.eclipse.papyrus.moka.fmi.bundles.root</artifactId>
 	</parent>
 	
 	<!-- POM Description -->
diff --git a/features/org.eclipse.papyrus.moka.fmi.feature/.project b/fmi/features/org.eclipse.papyrus.moka.fmi.feature/.project
similarity index 100%
rename from features/org.eclipse.papyrus.moka.fmi.feature/.project
rename to fmi/features/org.eclipse.papyrus.moka.fmi.feature/.project
diff --git a/features/org.eclipse.papyrus.moka.fmi.feature/about.html b/fmi/features/org.eclipse.papyrus.moka.fmi.feature/about.html
similarity index 100%
rename from features/org.eclipse.papyrus.moka.fmi.feature/about.html
rename to fmi/features/org.eclipse.papyrus.moka.fmi.feature/about.html
diff --git a/features/org.eclipse.papyrus.moka.fmi.feature/build.properties b/fmi/features/org.eclipse.papyrus.moka.fmi.feature/build.properties
similarity index 100%
rename from features/org.eclipse.papyrus.moka.fmi.feature/build.properties
rename to fmi/features/org.eclipse.papyrus.moka.fmi.feature/build.properties
diff --git a/features/org.eclipse.papyrus.moka.fmi.feature/feature.properties b/fmi/features/org.eclipse.papyrus.moka.fmi.feature/feature.properties
similarity index 100%
rename from features/org.eclipse.papyrus.moka.fmi.feature/feature.properties
rename to fmi/features/org.eclipse.papyrus.moka.fmi.feature/feature.properties
diff --git a/features/org.eclipse.papyrus.moka.fmi.feature/feature.xml b/fmi/features/org.eclipse.papyrus.moka.fmi.feature/feature.xml
similarity index 100%
rename from features/org.eclipse.papyrus.moka.fmi.feature/feature.xml
rename to fmi/features/org.eclipse.papyrus.moka.fmi.feature/feature.xml
diff --git a/features/org.eclipse.papyrus.moka.fmi.feature/pom.xml b/fmi/features/org.eclipse.papyrus.moka.fmi.feature/pom.xml
similarity index 80%
rename from features/org.eclipse.papyrus.moka.fmi.feature/pom.xml
rename to fmi/features/org.eclipse.papyrus.moka.fmi.feature/pom.xml
index 0b458f8..2c68ee7 100644
--- a/features/org.eclipse.papyrus.moka.fmi.feature/pom.xml
+++ b/fmi/features/org.eclipse.papyrus.moka.fmi.feature/pom.xml
@@ -3,8 +3,8 @@
 	
 	<!-- Parent POM (i.e., POM located in the feature folder) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.features.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
+		<artifactId>org.eclipse.papyrus.moka.fmi.features</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 	
diff --git a/fmi/features/pom.xml b/fmi/features/pom.xml
new file mode 100644
index 0000000..3edfda2
--- /dev/null
+++ b/fmi/features/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
+		<artifactId>org.eclipse.papyrus.moka.fmi.root</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.fmi.features</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.moka.fmi.feature</module>
+	</modules>	
+	
+</project>
\ No newline at end of file
diff --git a/fmi/pom.xml b/fmi/pom.xml
new file mode 100644
index 0000000..0224b2d
--- /dev/null
+++ b/fmi/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<artifactId>org.eclipse.papyrus.moka.incubation.root</artifactId>		
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<groupId>org.eclipse.papyrus.moka.fmi</groupId>
+	<artifactId>org.eclipse.papyrus.moka.fmi.root</artifactId>
+	<version>0.7.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+		
+	<profiles>
+		<profile>
+			<id>fmi</id>	
+			<properties>
+				<targetplatform.groupId>org.eclipse.papyrus.moka.fmi</targetplatform.groupId>
+				<targetplatform.artifactId>org.eclipse.papyrus.moka.fmi.targetplatform</targetplatform.artifactId>
+				<targetplatform.version>0.7.0-SNAPSHOT</targetplatform.version>
+			</properties>
+			
+			<modules>
+				<module>bundles</module>
+				<module>features</module>
+				<module>releng</module>
+			</modules>
+		</profile>
+	</profiles>
+	
+</project>
\ No newline at end of file
diff --git a/fmi/releng/pom.xml b/fmi/releng/pom.xml
new file mode 100644
index 0000000..a6595c6
--- /dev/null
+++ b/fmi/releng/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
+		<artifactId>org.eclipse.papyrus.moka.fmi.root</artifactId>		
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.fmi.releng</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>targetplatform</module>
+	</modules>	
+	
+</project>
\ No newline at end of file
diff --git a/fmi/releng/targetplatform/org.eclipse.papyrus.moka.fmi.targetplatform.target b/fmi/releng/targetplatform/org.eclipse.papyrus.moka.fmi.targetplatform.target
new file mode 100644
index 0000000..92a8705
--- /dev/null
+++ b/fmi/releng/targetplatform/org.eclipse.papyrus.moka.fmi.targetplatform.target
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Moka incubation - FMI" sequenceNumber="1626441839">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse" location="http://download.eclipse.org/releases/2020-12"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.moka.feature.feature.group" version="0.0.0"/>
+      <repository id="moka" location="https://ci.eclipse.org/papyrus/view/Moka/job/papyrus-moka-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.moka.p2/target/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="0.0.0"/>
+      <repository id="sysml14" location="https://ci.eclipse.org/papyrus/job/papyrus-sysml14-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/"/>
+    </location>
+  </locations>
+</target>
diff --git a/fmi/releng/targetplatform/org.eclipse.papyrus.moka.fmi.targetplatform.tpd b/fmi/releng/targetplatform/org.eclipse.papyrus.moka.fmi.targetplatform.tpd
new file mode 100644
index 0000000..d2a9a3d
--- /dev/null
+++ b/fmi/releng/targetplatform/org.eclipse.papyrus.moka.fmi.targetplatform.tpd
@@ -0,0 +1,14 @@
+target "Moka incubation - FMI" with source requirements
+
+location "http://download.eclipse.org/releases/2020-12" eclipse {
+	org.eclipse.platform.feature.group lazy
+	org.eclipse.papyrus.sdk.feature.feature.group lazy
+}
+
+location "https://ci.eclipse.org/papyrus/view/Moka/job/papyrus-moka-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.moka.p2/target/repository/" moka {
+	org.eclipse.papyrus.moka.feature.feature.group lazy
+}
+
+location "https://ci.eclipse.org/papyrus/job/papyrus-sysml14-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/" sysml14 {
+	org.eclipse.papyrus.sysml14.feature.feature.group lazy
+}
\ No newline at end of file
diff --git a/fmi/releng/targetplatform/pom.xml b/fmi/releng/targetplatform/pom.xml
new file mode 100644
index 0000000..01b7c11
--- /dev/null
+++ b/fmi/releng/targetplatform/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
+		<artifactId>org.eclipse.papyrus.moka.fmi.releng</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.fmi.targetplatform</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	
+</project>
\ No newline at end of file
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/.classpath b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/.classpath
similarity index 100%
rename from tests/fmi/org.eclipse.papyrus.moka.fmi.test/.classpath
rename to fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/.classpath
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/.project b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/.project
similarity index 100%
rename from tests/fmi/org.eclipse.papyrus.moka.fmi.test/.project
rename to fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/.project
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/META-INF/MANIFEST.MF b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/META-INF/MANIFEST.MF
similarity index 100%
rename from tests/fmi/org.eclipse.papyrus.moka.fmi.test/META-INF/MANIFEST.MF
rename to fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/META-INF/MANIFEST.MF
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/TestFMI.launch b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/TestFMI.launch
similarity index 100%
rename from tests/fmi/org.eclipse.papyrus.moka.fmi.test/TestFMI.launch
rename to fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/TestFMI.launch
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/about.html b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/about.html
similarity index 100%
rename from tests/fmi/org.eclipse.papyrus.moka.fmi.test/about.html
rename to fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/about.html
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/build.properties b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/build.properties
similarity index 100%
rename from tests/fmi/org.eclipse.papyrus.moka.fmi.test/build.properties
rename to fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/build.properties
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/pom.xml b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/pom.xml
similarity index 91%
rename from tests/fmi/org.eclipse.papyrus.moka.fmi.test/pom.xml
rename to fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/pom.xml
index 88da7e0..4b16724 100644
--- a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/pom.xml
+++ b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/pom.xml
@@ -7,7 +7,7 @@
 	
 	<!-- Parent POM (i.e., Tests) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
 		<artifactId>org.eclipse.papyrus.moka.tests.fmi</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV.fmu b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV.fmu
similarity index 100%
rename from tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV.fmu
rename to fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV.fmu
Binary files differ
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/linux64/PV.so b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/linux64/PV.so
similarity index 99%
rename from tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/linux64/PV.so
rename to fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/linux64/PV.so
index 973c656..d173531 100644
--- a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/linux64/PV.so
+++ b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/linux64/PV.so
Binary files differ
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/linux64/README.txt b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/linux64/README.txt
similarity index 100%
rename from tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/linux64/README.txt
rename to fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/linux64/README.txt
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/testFileThatShouldNotBeThere.txt b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/testFileThatShouldNotBeThere.txt
similarity index 100%
rename from tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/testFileThatShouldNotBeThere.txt
rename to fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/testFileThatShouldNotBeThere.txt
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/win64/PV.dll b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/win64/PV.dll
similarity index 99%
rename from tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/win64/PV.dll
rename to fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/win64/PV.dll
index 973c656..d173531 100644
--- a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/win64/PV.dll
+++ b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/win64/PV.dll
Binary files differ
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/win64/PV.lib b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/win64/PV.lib
similarity index 100%
rename from tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/win64/PV.lib
rename to fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/binaries/win64/PV.lib
Binary files differ
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/modelDescription.xml b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/modelDescription.xml
similarity index 100%
rename from tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/modelDescription.xml
rename to fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/modelDescription.xml
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/resources/testFile.txt b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/resources/testFile.txt
similarity index 100%
rename from tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/resources/testFile.txt
rename to fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/resources/testFile.txt
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/resources/testSubFolder/testFile.txt b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/resources/testSubFolder/testFile.txt
similarity index 100%
rename from tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/resources/testSubFolder/testFile.txt
rename to fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/PV/resources/testSubFolder/testFile.txt
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/modelDescription.xml b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/modelDescription.xml
similarity index 100%
rename from tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/modelDescription.xml
rename to fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/modelDescription.xml
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/subResources.zip b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/subResources.zip
similarity index 100%
rename from tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/subResources.zip
rename to fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/resources/subResources.zip
Binary files differ
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/Activator.java b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/Activator.java
similarity index 100%
rename from tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/Activator.java
rename to fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/Activator.java
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/AllTests.java b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/AllTests.java
similarity index 100%
rename from tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/AllTests.java
rename to fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/AllTests.java
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/TestFMI.java b/fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/TestFMI.java
similarity index 100%
rename from tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/TestFMI.java
rename to fmi/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/TestFMI.java
diff --git a/tests/fmi/pom.xml b/fmi/tests/fmi/pom.xml
similarity index 95%
rename from tests/fmi/pom.xml
rename to fmi/tests/fmi/pom.xml
index 81ebc32..d729a2d 100644
--- a/tests/fmi/pom.xml
+++ b/fmi/tests/fmi/pom.xml
@@ -7,7 +7,7 @@
 	<!-- Parent POM (i.e., Tests) -->
 	<parent>
 		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
 		<artifactId>org.eclipse.papyrus.moka.incubation.tests.root</artifactId>
 	</parent>
 
diff --git a/tests/pom.xml b/fmi/tests/pom.xml
similarity index 92%
rename from tests/pom.xml
rename to fmi/tests/pom.xml
index 3016095..cae567a 100644
--- a/tests/pom.xml
+++ b/fmi/tests/pom.xml
@@ -7,7 +7,7 @@
 	<!-- Parent of this POM -->
 	<parent>
 		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<groupId>org.eclipse.papyrus.moka.fmi</groupId>
 		<artifactId>org.eclipse.papyrus.moka.incubation.root</artifactId>
 	</parent>
 
diff --git a/instancespecification/.project b/instancespecification/.project
new file mode 100644
index 0000000..fbcfb13
--- /dev/null
+++ b/instancespecification/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>instancespecification</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/.classpath b/instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/.classpath
similarity index 100%
rename from bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/.classpath
rename to instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/.classpath
diff --git a/bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/.project b/instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/.project
similarity index 100%
rename from bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/.project
rename to instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/.project
diff --git a/bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/META-INF/MANIFEST.MF b/instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/META-INF/MANIFEST.MF
rename to instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/META-INF/MANIFEST.MF
diff --git a/bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/about.html b/instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/about.html
similarity index 100%
rename from bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/about.html
rename to instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/about.html
diff --git a/bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/build.properties b/instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/build.properties
similarity index 100%
rename from bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/build.properties
rename to instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/build.properties
diff --git a/bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/config/instancespecification.nattableconfiguration b/instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/config/instancespecification.nattableconfiguration
similarity index 100%
rename from bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/config/instancespecification.nattableconfiguration
rename to instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/config/instancespecification.nattableconfiguration
diff --git a/bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/config/uml.architecture b/instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/config/uml.architecture
similarity index 100%
rename from bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/config/uml.architecture
rename to instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/config/uml.architecture
diff --git a/bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/plugin.xml b/instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/plugin.xml
similarity index 100%
rename from bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/plugin.xml
rename to instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/plugin.xml
diff --git a/bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/pom.xml b/instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/pom.xml
similarity index 87%
rename from bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/pom.xml
rename to instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/pom.xml
index 292380f..283b592 100644
--- a/bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/pom.xml
+++ b/instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/pom.xml
@@ -5,8 +5,8 @@
 
 	<!-- Parent POM (i.e., UI) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.instancespecification.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.instancespecification</groupId>
+		<artifactId>org.eclipse.papyrus.moka.incubation.instancespecification.bundles.root</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 
diff --git a/bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/Activator.java b/instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/Activator.java
similarity index 100%
rename from bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/Activator.java
rename to instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/Activator.java
diff --git a/bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/CustomSpecificationSetCommand.java b/instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/CustomSpecificationSetCommand.java
similarity index 100%
rename from bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/CustomSpecificationSetCommand.java
rename to instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/CustomSpecificationSetCommand.java
diff --git a/bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecCellAxisConfiguration.java b/instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecCellAxisConfiguration.java
similarity index 100%
rename from bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecCellAxisConfiguration.java
rename to instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecCellAxisConfiguration.java
diff --git a/bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationRowAxisManager.java b/instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationRowAxisManager.java
similarity index 100%
rename from bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationRowAxisManager.java
rename to instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationRowAxisManager.java
diff --git a/bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableCellManager.java b/instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableCellManager.java
similarity index 100%
rename from bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableCellManager.java
rename to instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableCellManager.java
diff --git a/bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableHeaderLabelProvider.java b/instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableHeaderLabelProvider.java
similarity index 100%
rename from bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableHeaderLabelProvider.java
rename to instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableHeaderLabelProvider.java
diff --git a/bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableTester.java b/instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableTester.java
similarity index 100%
rename from bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableTester.java
rename to instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableTester.java
diff --git a/bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/Messages.java b/instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/Messages.java
similarity index 100%
rename from bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/Messages.java
rename to instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/Messages.java
diff --git a/bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/messages.properties b/instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/messages.properties
similarity index 100%
rename from bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/messages.properties
rename to instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/messages.properties
diff --git a/bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/util/InstanceSpecificationTableUtil.java b/instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/util/InstanceSpecificationTableUtil.java
similarity index 100%
rename from bundles/instancespecification/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/util/InstanceSpecificationTableUtil.java
rename to instancespecification/bundles/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/util/InstanceSpecificationTableUtil.java
diff --git a/bundles/instancespecification/pom.xml b/instancespecification/bundles/pom.xml
similarity index 79%
rename from bundles/instancespecification/pom.xml
rename to instancespecification/bundles/pom.xml
index 59a8f34..9f84ac6 100644
--- a/bundles/instancespecification/pom.xml
+++ b/instancespecification/bundles/pom.xml
@@ -7,12 +7,12 @@
 	<!-- Parent of this POM -->
 	<parent>
 		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.bundles.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.instancespecification</groupId>
+		<artifactId>org.eclipse.papyrus.moka.instancespecification.root</artifactId>
 	</parent>
 
 	<!-- Moka project root POM (aggregator) -->
-	<artifactId>org.eclipse.papyrus.moka.incubation.instancespecification.root</artifactId>
+	<artifactId>org.eclipse.papyrus.moka.incubation.instancespecification.bundles.root</artifactId>
 	<name>Moka Incubation Instance Specification</name>
 	<packaging>pom</packaging>
 
diff --git a/features/org.eclipse.papyrus.moka.instancespecification.feature/.project b/instancespecification/features/org.eclipse.papyrus.moka.instancespecification.feature/.project
similarity index 100%
rename from features/org.eclipse.papyrus.moka.instancespecification.feature/.project
rename to instancespecification/features/org.eclipse.papyrus.moka.instancespecification.feature/.project
diff --git a/features/org.eclipse.papyrus.moka.instancespecification.feature/about.html b/instancespecification/features/org.eclipse.papyrus.moka.instancespecification.feature/about.html
similarity index 100%
rename from features/org.eclipse.papyrus.moka.instancespecification.feature/about.html
rename to instancespecification/features/org.eclipse.papyrus.moka.instancespecification.feature/about.html
diff --git a/features/org.eclipse.papyrus.moka.instancespecification.feature/build.properties b/instancespecification/features/org.eclipse.papyrus.moka.instancespecification.feature/build.properties
similarity index 100%
rename from features/org.eclipse.papyrus.moka.instancespecification.feature/build.properties
rename to instancespecification/features/org.eclipse.papyrus.moka.instancespecification.feature/build.properties
diff --git a/features/org.eclipse.papyrus.moka.instancespecification.feature/feature.properties b/instancespecification/features/org.eclipse.papyrus.moka.instancespecification.feature/feature.properties
similarity index 100%
rename from features/org.eclipse.papyrus.moka.instancespecification.feature/feature.properties
rename to instancespecification/features/org.eclipse.papyrus.moka.instancespecification.feature/feature.properties
diff --git a/features/org.eclipse.papyrus.moka.instancespecification.feature/feature.xml b/instancespecification/features/org.eclipse.papyrus.moka.instancespecification.feature/feature.xml
similarity index 100%
rename from features/org.eclipse.papyrus.moka.instancespecification.feature/feature.xml
rename to instancespecification/features/org.eclipse.papyrus.moka.instancespecification.feature/feature.xml
diff --git a/features/org.eclipse.papyrus.moka.instancespecification.feature/pom.xml b/instancespecification/features/org.eclipse.papyrus.moka.instancespecification.feature/pom.xml
similarity index 79%
rename from features/org.eclipse.papyrus.moka.instancespecification.feature/pom.xml
rename to instancespecification/features/org.eclipse.papyrus.moka.instancespecification.feature/pom.xml
index 685362e..3fb34ee 100644
--- a/features/org.eclipse.papyrus.moka.instancespecification.feature/pom.xml
+++ b/instancespecification/features/org.eclipse.papyrus.moka.instancespecification.feature/pom.xml
@@ -3,8 +3,8 @@
 	
 	<!-- Parent POM (i.e., POM located in the feature folder) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.features.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.instancespecification</groupId>
+		<artifactId>org.eclipse.papyrus.moka.instancespecification.features</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 	
diff --git a/instancespecification/features/pom.xml b/instancespecification/features/pom.xml
new file mode 100644
index 0000000..8d76baf
--- /dev/null
+++ b/instancespecification/features/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.instancespecification</groupId>
+		<artifactId>org.eclipse.papyrus.moka.instancespecification.root</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.instancespecification.features</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.moka.instancespecification.feature</module>
+	</modules>	
+	
+</project>
\ No newline at end of file
diff --git a/instancespecification/pom.xml b/instancespecification/pom.xml
new file mode 100644
index 0000000..151eb40
--- /dev/null
+++ b/instancespecification/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<artifactId>org.eclipse.papyrus.moka.incubation.root</artifactId>		
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<groupId>org.eclipse.papyrus.moka.instancespecification</groupId>
+	<artifactId>org.eclipse.papyrus.moka.instancespecification.root</artifactId>
+	<version>0.7.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+		
+	<profiles>
+		<profile>
+			<id>instancespecification</id>	
+			<properties>
+				<targetplatform.groupId>org.eclipse.papyrus.moka.instancespecification</targetplatform.groupId>
+				<targetplatform.artifactId>org.eclipse.papyrus.moka.instancespecification.targetplatform</targetplatform.artifactId>
+				<targetplatform.version>0.7.0-SNAPSHOT</targetplatform.version>
+			</properties>
+			
+			<modules>
+				<module>bundles</module>
+				<module>features</module>
+				<module>releng</module>
+			</modules>
+		</profile>
+	</profiles>
+	
+</project>
\ No newline at end of file
diff --git a/instancespecification/releng/org.eclipse.papyrus.moka.instancespecification.p2/.project b/instancespecification/releng/org.eclipse.papyrus.moka.instancespecification.p2/.project
new file mode 100644
index 0000000..0a79233
--- /dev/null
+++ b/instancespecification/releng/org.eclipse.papyrus.moka.instancespecification.p2/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.incubation.p2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/instancespecification/releng/org.eclipse.papyrus.moka.instancespecification.p2/category.xml b/instancespecification/releng/org.eclipse.papyrus.moka.instancespecification.p2/category.xml
new file mode 100644
index 0000000..03e160a
--- /dev/null
+++ b/instancespecification/releng/org.eclipse.papyrus.moka.instancespecification.p2/category.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+  <feature url="features/org.eclipse.papyrus.moka.instancespecification.feature_0.7.0.qualifier.jar" id="org.eclipse.papyrus.moka.instancespecification.feature" version="0.7.0.qualifier">
+      <category name="org.eclipse.papyrus.moka.incubation.category"/>
+   </feature>
+  
+  <category-def name="org.eclipse.papyrus.moka.incubation.category" label="Papyrus Moka Incubation">
+      <description>
+         Papyrus Moka Incubation features
+      </description>
+   </category-def>
+</site>
diff --git a/instancespecification/releng/org.eclipse.papyrus.moka.instancespecification.p2/pom.xml b/instancespecification/releng/org.eclipse.papyrus.moka.instancespecification.p2/pom.xml
new file mode 100644
index 0000000..86bb9d8
--- /dev/null
+++ b/instancespecification/releng/org.eclipse.papyrus.moka.instancespecification.p2/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.instancespecification</groupId>
+		<artifactId>org.eclipse.papyrus.moka.instancespecification.releng</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.instancespecification.p2</artifactId>
+	<packaging>eclipse-repository</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/instancespecification/releng/pom.xml b/instancespecification/releng/pom.xml
new file mode 100644
index 0000000..ad04587
--- /dev/null
+++ b/instancespecification/releng/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.instancespecification</groupId>
+		<artifactId>org.eclipse.papyrus.moka.instancespecification.root</artifactId>		
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.instancespecification.releng</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.moka.instancespecification.p2</module>
+		<module>targetplatform</module>
+	</modules>	
+	
+</project>
\ No newline at end of file
diff --git a/instancespecification/releng/targetplatform/org.eclipse.papyrus.moka.instancespecification.targetplatform.target b/instancespecification/releng/targetplatform/org.eclipse.papyrus.moka.instancespecification.targetplatform.target
new file mode 100644
index 0000000..d058a0e
--- /dev/null
+++ b/instancespecification/releng/targetplatform/org.eclipse.papyrus.moka.instancespecification.targetplatform.target
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Moka incubation - Instance Specification" sequenceNumber="1626437026">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse" location="http://download.eclipse.org/releases/2020-12"/>
+    </location>
+  </locations>
+</target>
diff --git a/instancespecification/releng/targetplatform/org.eclipse.papyrus.moka.instancespecification.targetplatform.tpd b/instancespecification/releng/targetplatform/org.eclipse.papyrus.moka.instancespecification.targetplatform.tpd
new file mode 100644
index 0000000..340566a
--- /dev/null
+++ b/instancespecification/releng/targetplatform/org.eclipse.papyrus.moka.instancespecification.targetplatform.tpd
@@ -0,0 +1,6 @@
+target "Moka incubation - Instance Specification" with source requirements
+
+location "http://download.eclipse.org/releases/2020-12" eclipse {
+	org.eclipse.platform.feature.group lazy
+	org.eclipse.papyrus.sdk.feature.feature.group lazy
+}
diff --git a/instancespecification/releng/targetplatform/pom.xml b/instancespecification/releng/targetplatform/pom.xml
new file mode 100644
index 0000000..d5b0e38
--- /dev/null
+++ b/instancespecification/releng/targetplatform/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.instancespecification</groupId>
+		<artifactId>org.eclipse.papyrus.moka.instancespecification.releng</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.instancespecification.targetplatform</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	
+</project>
\ No newline at end of file
diff --git a/parametric/.project b/parametric/.project
new file mode 100644
index 0000000..0b8c692
--- /dev/null
+++ b/parametric/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>parametric</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric.ui/.classpath b/parametric/bundles/org.eclipse.papyrus.moka.parametric.ui/.classpath
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric.ui/.classpath
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric.ui/.classpath
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric.ui/.project b/parametric/bundles/org.eclipse.papyrus.moka.parametric.ui/.project
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric.ui/.project
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric.ui/.project
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric.ui/META-INF/MANIFEST.MF b/parametric/bundles/org.eclipse.papyrus.moka.parametric.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric.ui/META-INF/MANIFEST.MF
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric.ui/META-INF/MANIFEST.MF
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric.ui/about.html b/parametric/bundles/org.eclipse.papyrus.moka.parametric.ui/about.html
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric.ui/about.html
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric.ui/about.html
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric.ui/build.properties b/parametric/bundles/org.eclipse.papyrus.moka.parametric.ui/build.properties
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric.ui/build.properties
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric.ui/build.properties
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric.ui/plugin.xml b/parametric/bundles/org.eclipse.papyrus.moka.parametric.ui/plugin.xml
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric.ui/plugin.xml
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric.ui/plugin.xml
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric.ui/pom.xml b/parametric/bundles/org.eclipse.papyrus.moka.parametric.ui/pom.xml
similarity index 79%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric.ui/pom.xml
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric.ui/pom.xml
index 7647646..cac4e2e 100644
--- a/bundles/parametric/org.eclipse.papyrus.moka.parametric.ui/pom.xml
+++ b/parametric/bundles/org.eclipse.papyrus.moka.parametric.ui/pom.xml
@@ -6,8 +6,8 @@
 	<!-- Parent of this POM -->
 	<parent>
 		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.parametric.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.parametric</groupId>
+		<artifactId>org.eclipse.papyrus.moka.parametric.bundles.root</artifactId>
 	</parent>
 
 	<!-- Moka project root POM (aggregator) -->
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric.ui/src/org/eclipse/papyrus/moka/parametric/ui/dnd/BlockDropStrategy.java b/parametric/bundles/org.eclipse.papyrus.moka.parametric.ui/src/org/eclipse/papyrus/moka/parametric/ui/dnd/BlockDropStrategy.java
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric.ui/src/org/eclipse/papyrus/moka/parametric/ui/dnd/BlockDropStrategy.java
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric.ui/src/org/eclipse/papyrus/moka/parametric/ui/dnd/BlockDropStrategy.java
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric.ui/src/org/eclipse/papyrus/moka/parametric/ui/dnd/command/BlockCreationCommand.java b/parametric/bundles/org.eclipse.papyrus.moka.parametric.ui/src/org/eclipse/papyrus/moka/parametric/ui/dnd/command/BlockCreationCommand.java
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric.ui/src/org/eclipse/papyrus/moka/parametric/ui/dnd/command/BlockCreationCommand.java
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric.ui/src/org/eclipse/papyrus/moka/parametric/ui/dnd/command/BlockCreationCommand.java
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric.ui/table/sysml14.architecture b/parametric/bundles/org.eclipse.papyrus.moka.parametric.ui/table/sysml14.architecture
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric.ui/table/sysml14.architecture
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric.ui/table/sysml14.architecture
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/.classpath b/parametric/bundles/org.eclipse.papyrus.moka.parametric/.classpath
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/.classpath
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/.classpath
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/.project b/parametric/bundles/org.eclipse.papyrus.moka.parametric/.project
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/.project
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/.project
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/.pydevproject b/parametric/bundles/org.eclipse.papyrus.moka.parametric/.pydevproject
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/.pydevproject
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/.pydevproject
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/META-INF/MANIFEST.MF b/parametric/bundles/org.eclipse.papyrus.moka.parametric/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/META-INF/MANIFEST.MF
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/META-INF/MANIFEST.MF
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/about.html b/parametric/bundles/org.eclipse.papyrus.moka.parametric/about.html
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/about.html
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/about.html
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/build.properties b/parametric/bundles/org.eclipse.papyrus.moka.parametric/build.properties
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/build.properties
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/build.properties
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/plugin.xml b/parametric/bundles/org.eclipse.papyrus.moka.parametric/plugin.xml
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/plugin.xml
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/plugin.xml
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/pom.xml b/parametric/bundles/org.eclipse.papyrus.moka.parametric/pom.xml
similarity index 79%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/pom.xml
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/pom.xml
index e60bc80..5428dfa 100644
--- a/bundles/parametric/org.eclipse.papyrus.moka.parametric/pom.xml
+++ b/parametric/bundles/org.eclipse.papyrus.moka.parametric/pom.xml
@@ -6,8 +6,8 @@
 	<!-- Parent of this POM -->
 	<parent>
 		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.parametric.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.parametric</groupId>
+		<artifactId>org.eclipse.papyrus.moka.parametric.bundles.root</artifactId>
 	</parent>
 
 	<!-- Moka project root POM (aggregator) -->
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/resources/profile/MokaParametric.profile.di b/parametric/bundles/org.eclipse.papyrus.moka.parametric/resources/profile/MokaParametric.profile.di
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/resources/profile/MokaParametric.profile.di
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/resources/profile/MokaParametric.profile.di
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/resources/profile/MokaParametric.profile.notation b/parametric/bundles/org.eclipse.papyrus.moka.parametric/resources/profile/MokaParametric.profile.notation
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/resources/profile/MokaParametric.profile.notation
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/resources/profile/MokaParametric.profile.notation
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/resources/profile/MokaParametric.profile.uml b/parametric/bundles/org.eclipse.papyrus.moka.parametric/resources/profile/MokaParametric.profile.uml
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/resources/profile/MokaParametric.profile.uml
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/resources/profile/MokaParametric.profile.uml
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/schema/constraintObjectFactory.exsd b/parametric/bundles/org.eclipse.papyrus.moka.parametric/schema/constraintObjectFactory.exsd
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/schema/constraintObjectFactory.exsd
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/schema/constraintObjectFactory.exsd
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/CausalParametricEngine.java b/parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/CausalParametricEngine.java
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/CausalParametricEngine.java
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/CausalParametricEngine.java
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/ParametricEvaluator.java b/parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/ParametricEvaluator.java
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/ParametricEvaluator.java
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/ParametricEvaluator.java
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/PostParametricEvaluationTask.java b/parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/PostParametricEvaluationTask.java
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/PostParametricEvaluationTask.java
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/PostParametricEvaluationTask.java
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/SerializeResultTask.java b/parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/SerializeResultTask.java
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/SerializeResultTask.java
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/SerializeResultTask.java
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/BindingLink.java b/parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/BindingLink.java
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/BindingLink.java
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/BindingLink.java
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/ConstraintObject.java b/parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/ConstraintObject.java
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/ConstraintObject.java
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/ConstraintObject.java
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/EvaluationGraph.java b/parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/EvaluationGraph.java
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/EvaluationGraph.java
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/EvaluationGraph.java
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/IEvaluable.java b/parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/IEvaluable.java
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/IEvaluable.java
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/IEvaluable.java
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/ParametricConstructStrategy.java b/parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/ParametricConstructStrategy.java
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/ParametricConstructStrategy.java
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/ParametricConstructStrategy.java
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/ParametricExecutionFactory.java b/parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/ParametricExecutionFactory.java
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/ParametricExecutionFactory.java
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/ParametricExecutionFactory.java
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/ParametricLocus.java b/parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/ParametricLocus.java
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/ParametricLocus.java
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/ParametricLocus.java
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/ParametricObject.java b/parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/ParametricObject.java
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/ParametricObject.java
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/ParametricObject.java
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/Parametric_InstanceValueEvaluation.java b/parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/Parametric_InstanceValueEvaluation.java
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/Parametric_InstanceValueEvaluation.java
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/Parametric_InstanceValueEvaluation.java
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/UpdateDescriptor.java b/parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/UpdateDescriptor.java
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/UpdateDescriptor.java
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/semantics/UpdateDescriptor.java
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/tasks/CausalParametricTaskExecutionFactory.java b/parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/tasks/CausalParametricTaskExecutionFactory.java
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/tasks/CausalParametricTaskExecutionFactory.java
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/tasks/CausalParametricTaskExecutionFactory.java
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/tasks/RootParametricTaskExecution.java b/parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/tasks/RootParametricTaskExecution.java
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/tasks/RootParametricTaskExecution.java
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/tasks/RootParametricTaskExecution.java
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/utils/Graph.java b/parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/utils/Graph.java
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/utils/Graph.java
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/utils/Graph.java
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/utils/IConstraintObjectFactory.java b/parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/utils/IConstraintObjectFactory.java
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/utils/IConstraintObjectFactory.java
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/utils/IConstraintObjectFactory.java
diff --git a/bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/utils/NameUtils.java b/parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/utils/NameUtils.java
similarity index 100%
rename from bundles/parametric/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/utils/NameUtils.java
rename to parametric/bundles/org.eclipse.papyrus.moka.parametric/src/org/eclipse/papyrus/moka/parametric/utils/NameUtils.java
diff --git a/bundles/parametric/pom.xml b/parametric/bundles/pom.xml
similarity index 76%
rename from bundles/parametric/pom.xml
rename to parametric/bundles/pom.xml
index bf0b1c1..5bf2537 100644
--- a/bundles/parametric/pom.xml
+++ b/parametric/bundles/pom.xml
@@ -7,12 +7,12 @@
 	<!-- Parent of this POM -->
 	<parent>
 		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.bundles.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.parametric</groupId>
+		<artifactId>org.eclipse.papyrus.moka.parametric.root</artifactId>
 	</parent>
 
 	<!-- Moka project root POM (aggregator) -->
-	<artifactId>org.eclipse.papyrus.moka.incubation.parametric.root</artifactId>
+	<artifactId>org.eclipse.papyrus.moka.parametric.bundles.root</artifactId>
 	<name>Moka Incubation Parameteric Bundles</name>
 	<packaging>pom</packaging>
 
diff --git a/features/org.eclipse.papyrus.moka.parametric.feature/.project b/parametric/features/org.eclipse.papyrus.moka.parametric.feature/.project
similarity index 100%
rename from features/org.eclipse.papyrus.moka.parametric.feature/.project
rename to parametric/features/org.eclipse.papyrus.moka.parametric.feature/.project
diff --git a/features/org.eclipse.papyrus.moka.parametric.feature/about.html b/parametric/features/org.eclipse.papyrus.moka.parametric.feature/about.html
similarity index 100%
rename from features/org.eclipse.papyrus.moka.parametric.feature/about.html
rename to parametric/features/org.eclipse.papyrus.moka.parametric.feature/about.html
diff --git a/features/org.eclipse.papyrus.moka.parametric.feature/build.properties b/parametric/features/org.eclipse.papyrus.moka.parametric.feature/build.properties
similarity index 100%
rename from features/org.eclipse.papyrus.moka.parametric.feature/build.properties
rename to parametric/features/org.eclipse.papyrus.moka.parametric.feature/build.properties
diff --git a/features/org.eclipse.papyrus.moka.parametric.feature/feature.properties b/parametric/features/org.eclipse.papyrus.moka.parametric.feature/feature.properties
similarity index 100%
rename from features/org.eclipse.papyrus.moka.parametric.feature/feature.properties
rename to parametric/features/org.eclipse.papyrus.moka.parametric.feature/feature.properties
diff --git a/features/org.eclipse.papyrus.moka.parametric.feature/feature.xml b/parametric/features/org.eclipse.papyrus.moka.parametric.feature/feature.xml
similarity index 100%
rename from features/org.eclipse.papyrus.moka.parametric.feature/feature.xml
rename to parametric/features/org.eclipse.papyrus.moka.parametric.feature/feature.xml
diff --git a/features/org.eclipse.papyrus.moka.parametric.feature/pom.xml b/parametric/features/org.eclipse.papyrus.moka.parametric.feature/pom.xml
similarity index 84%
rename from features/org.eclipse.papyrus.moka.parametric.feature/pom.xml
rename to parametric/features/org.eclipse.papyrus.moka.parametric.feature/pom.xml
index 781b2c7..32d75e3 100644
--- a/features/org.eclipse.papyrus.moka.parametric.feature/pom.xml
+++ b/parametric/features/org.eclipse.papyrus.moka.parametric.feature/pom.xml
@@ -5,8 +5,8 @@
 	
 	<!-- Parent POM (i.e., POM located in the feature folder) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.features.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.parametric</groupId>
+		<artifactId>org.eclipse.papyrus.moka.parametric.features</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 	
diff --git a/parametric/features/pom.xml b/parametric/features/pom.xml
new file mode 100644
index 0000000..7f0f398
--- /dev/null
+++ b/parametric/features/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.parametric</groupId>
+		<artifactId>org.eclipse.papyrus.moka.parametric.root</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.parametric.features</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.moka.parametric.feature</module>
+	</modules>	
+	
+</project>
\ No newline at end of file
diff --git a/parametric/pom.xml b/parametric/pom.xml
new file mode 100644
index 0000000..3383203
--- /dev/null
+++ b/parametric/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<artifactId>org.eclipse.papyrus.moka.incubation.root</artifactId>		
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<groupId>org.eclipse.papyrus.moka.parametric</groupId>
+	<artifactId>org.eclipse.papyrus.moka.parametric.root</artifactId>
+	<version>0.7.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+		
+	<profiles>
+		<profile>
+			<id>parametric</id>	
+			<properties>
+				<targetplatform.groupId>org.eclipse.papyrus.moka.parametric</targetplatform.groupId>
+				<targetplatform.artifactId>org.eclipse.papyrus.moka.parametric.targetplatform</targetplatform.artifactId>
+				<targetplatform.version>0.7.0-SNAPSHOT</targetplatform.version>
+			</properties>
+			
+			<modules>
+				<module>bundles</module>
+				<module>features</module>
+				<module>releng</module>
+			</modules>
+		</profile>
+	</profiles>
+	
+</project>
\ No newline at end of file
diff --git a/parametric/releng/org.eclipse.papyrus.moka.parametric.p2/.project b/parametric/releng/org.eclipse.papyrus.moka.parametric.p2/.project
new file mode 100644
index 0000000..0a79233
--- /dev/null
+++ b/parametric/releng/org.eclipse.papyrus.moka.parametric.p2/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.incubation.p2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/parametric/releng/org.eclipse.papyrus.moka.parametric.p2/category.xml b/parametric/releng/org.eclipse.papyrus.moka.parametric.p2/category.xml
new file mode 100644
index 0000000..a450927
--- /dev/null
+++ b/parametric/releng/org.eclipse.papyrus.moka.parametric.p2/category.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+  <feature url="features/org.eclipse.papyrus.moka.parametric.feature_0.7.0.qualifier.jar" id="org.eclipse.papyrus.moka.parametric.feature" version="0.7.0.qualifier">
+      <category name="org.eclipse.papyrus.moka.incubation.category"/>
+   </feature>
+  
+  <category-def name="org.eclipse.papyrus.moka.incubation.category" label="Papyrus Moka Incubation">
+      <description>
+         Papyrus Moka Incubation features
+      </description>
+   </category-def>
+</site>
diff --git a/parametric/releng/org.eclipse.papyrus.moka.parametric.p2/pom.xml b/parametric/releng/org.eclipse.papyrus.moka.parametric.p2/pom.xml
new file mode 100644
index 0000000..b8a5009
--- /dev/null
+++ b/parametric/releng/org.eclipse.papyrus.moka.parametric.p2/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.parametric</groupId>
+		<artifactId>org.eclipse.papyrus.moka.parametric.releng</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.parametric.p2</artifactId>
+	<packaging>eclipse-repository</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/parametric/releng/pom.xml b/parametric/releng/pom.xml
new file mode 100644
index 0000000..c931b5a
--- /dev/null
+++ b/parametric/releng/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.parametric</groupId>
+		<artifactId>org.eclipse.papyrus.moka.parametric.root</artifactId>		
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.parametric.releng</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.moka.parametric.p2</module>
+		<module>targetplatform</module>
+	</modules>	
+	
+</project>
\ No newline at end of file
diff --git a/parametric/releng/targetplatform/org.eclipse.papyrus.moka.parametric.targetplatform.target b/parametric/releng/targetplatform/org.eclipse.papyrus.moka.parametric.targetplatform.target
new file mode 100644
index 0000000..02e441e
--- /dev/null
+++ b/parametric/releng/targetplatform/org.eclipse.papyrus.moka.parametric.targetplatform.target
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Moka incubation - Parametric" sequenceNumber="1626439752">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse" location="http://download.eclipse.org/releases/2020-12"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.moka.feature.feature.group" version="0.0.0"/>
+      <repository id="moka" location="https://ci.eclipse.org/papyrus/view/Moka/job/papyrus-moka-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.moka.p2/target/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.sysml16.feature.feature.group" version="0.0.0"/>
+      <repository id="sysml16" location="https://ci.eclipse.org/papyrus/job/papyrus-sysml16-master/lastSuccessfulBuild/artifact/sources/repository/"/>
+    </location>
+  </locations>
+</target>
diff --git a/parametric/releng/targetplatform/org.eclipse.papyrus.moka.parametric.targetplatform.tpd b/parametric/releng/targetplatform/org.eclipse.papyrus.moka.parametric.targetplatform.tpd
new file mode 100644
index 0000000..160a43b
--- /dev/null
+++ b/parametric/releng/targetplatform/org.eclipse.papyrus.moka.parametric.targetplatform.tpd
@@ -0,0 +1,15 @@
+target "Moka incubation - Parametric" with source requirements
+
+location "http://download.eclipse.org/releases/2020-12" eclipse {
+	org.eclipse.platform.feature.group lazy
+	org.eclipse.papyrus.sdk.feature.feature.group lazy
+}
+
+location "https://ci.eclipse.org/papyrus/view/Moka/job/papyrus-moka-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.moka.p2/target/repository/" moka {
+	org.eclipse.papyrus.moka.feature.feature.group lazy
+}
+
+location "https://ci.eclipse.org/papyrus/job/papyrus-sysml16-master/lastSuccessfulBuild/artifact/sources/repository/" sysml16 {
+	org.eclipse.papyrus.sysml16.feature.feature.group lazy
+}
+
diff --git a/parametric/releng/targetplatform/pom.xml b/parametric/releng/targetplatform/pom.xml
new file mode 100644
index 0000000..481e185
--- /dev/null
+++ b/parametric/releng/targetplatform/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.parametric</groupId>
+		<artifactId>org.eclipse.papyrus.moka.parametric.releng</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.parametric.targetplatform</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 8e4b39c..6761729 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,25 +4,163 @@
 
 	<modelVersion>4.0.0</modelVersion>
 
-	<!-- Parent of this POM -->
-	<parent>
-		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.releng.configuration</artifactId>
-		<relativePath>./releng/org.eclipse.papyrus.moka.incubation.configuration</relativePath>
-	</parent>
-
-	<!-- Moka project root POM (aggregator) -->
+	<groupId>org.eclipse.papyrus.moka.incubation</groupId>
 	<artifactId>org.eclipse.papyrus.moka.incubation.root</artifactId>
-	<name>Moka Incubation</name>
+	<version>0.7.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
-
+	<name>org.eclipse.papyrus.moka.incubation</name>
+	<description>Moka additional components (Incubation)</description>
+	<inceptionYear>2019</inceptionYear>
+	
 	<!-- Children modules to build -->
-	<modules>
-		<module>bundles</module>
-		<module>features</module>
-		<module>releng</module>
-		<module>tests</module>
+	<modules>		
+		<module>annotations</module>
+		<module>externalcontrol</module>
+		<!--module>fmi</module-->
+		<module>instancespecification</module>
+		<module>parametric</module>
+		<module>scripting</module>
+		<module>simex</module>
+		<module>suml</module>
+		<module>visualization</module>
 	</modules>
 
+	<properties>
+		<tycho.version>1.7.0</tycho.version>
+		<tycho.extras.version>1.7.0</tycho.extras.version>
+		<xtend.version>2.21.0</xtend.version>
+		<maven.resources.version>3.1.0</maven.resources.version>
+		<maven.clean.version>3.1.0</maven.clean.version>
+		<maven.compiler.version>3.8.0</maven.compiler.version>
+		<java.source.version>1.8</java.source.version>
+		<java.target.version>1.8</java.target.version>
+		<jboss.version>1.3.0</jboss.version>
+	</properties>
+
+	<scm>
+		<url>https://git.eclipse.org/r/papyrus/org.eclipse.papyrus-moka.incubation.git</url>
+	</scm>
+
+	<ciManagement>
+		<system>Jenkins</system>
+		<url>https://ci.eclipse.org/papyrus/view/Moka/job/papyrus-moka-incubation-master/</url>
+	</ciManagement>
+
+	<issueManagement>
+		<url>https://bugs.eclipse.org/bugs/buglist.cgi?product=Papyrus&amp;component=moka</url>
+	</issueManagement>
+
+	<repositories>
+		<repository>
+			<id>license-feature</id>
+			<url>http://download.eclipse.org/cbi/updates/license/</url>
+			<layout>p2</layout>
+		</repository>
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>jboss-public-repository-group</id>
+			<name>JBoss Public Repository Group</name>
+			<url>http://repository.jboss.org/nexus/content/groups/public/</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>jboss-snapshots-repository</id>
+			<name>JBoss Snapshots Repository</name>
+			<url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>${maven.compiler.version}</version>
+				<configuration>
+					<source>${java.source.version}</source>
+					<target>${java.target.version}</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>${maven.resources.version}</version>
+				<configuration>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clean-plugin</artifactId>
+				<version>${maven.clean.version}</version>
+			</plugin>
+
+			<plugin>
+				<groupId>org.eclipse.xtend</groupId>
+				<artifactId>xtend-maven-plugin</artifactId>
+				<version>${xtend.version}</version>
+			</plugin>
+
+			<!-- Integration between Tycho and Maven -->
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-maven-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+
+			<!-- Tycho compiler -->
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-compiler-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+					<source>${java.source.version}</source>
+					<target>${java.target.version}</target>
+					<optimize>true</optimize>
+					<showWarnings>true</showWarnings>
+					<!-- Tycho build using the project's JDT settings. -->
+					<useProjectSettings>true</useProjectSettings>
+				</configuration>
+			</plugin>
+
+			<!-- Tycho extras -->
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<version>${tycho.extras.version}</version>
+			</plugin>
+
+			<!-- Target platform based build -->
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+					<!-- Enabled target platform -->
+					<environments>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+					</environments>
+					<target>
+						<artifact>
+							<groupId>${targetplatform.groupId}</groupId>
+							<artifactId>${targetplatform.artifactId}</artifactId>
+							<version>${targetplatform.version}</version>
+						</artifact>
+					</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
 </project>
diff --git a/scripting/.project b/scripting/.project
new file mode 100644
index 0000000..938af85
--- /dev/null
+++ b/scripting/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>scripting</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/.classpath b/scripting/bundles/org.eclipse.papyrus.moka.ease/.classpath
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/.classpath
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/.classpath
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/.project b/scripting/bundles/org.eclipse.papyrus.moka.ease/.project
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/.project
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/.project
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/.pydevproject b/scripting/bundles/org.eclipse.papyrus.moka.ease/.pydevproject
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/.pydevproject
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/.pydevproject
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/META-INF/MANIFEST.MF b/scripting/bundles/org.eclipse.papyrus.moka.ease/META-INF/MANIFEST.MF
similarity index 96%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/META-INF/MANIFEST.MF
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/META-INF/MANIFEST.MF
index caae775..daef746 100644
--- a/bundles/scripting/org.eclipse.papyrus.moka.ease/META-INF/MANIFEST.MF
+++ b/scripting/bundles/org.eclipse.papyrus.moka.ease/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="3.1.0",
  org.eclipse.papyrus.infra.emf;bundle-version="3.1.0",
  org.eclipse.papyrus.moka.modeling.utils;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.sysml16;bundle-version="1.0.0",
  org.eclipse.debug.core;bundle-version="3.14.0",
  org.eclipse.papyrus.moka.kernel;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.moka.engine.uml;bundle-version="[4.0.0,5.0.0)",
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/about.html b/scripting/bundles/org.eclipse.papyrus.moka.ease/about.html
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/about.html
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/about.html
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/build.properties b/scripting/bundles/org.eclipse.papyrus.moka.ease/build.properties
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/build.properties
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/build.properties
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/cheatsheets/testcheatsheet.xml b/scripting/bundles/org.eclipse.papyrus.moka.ease/cheatsheets/testcheatsheet.xml
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/cheatsheets/testcheatsheet.xml
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/cheatsheets/testcheatsheet.xml
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/plugin.xml b/scripting/bundles/org.eclipse.papyrus.moka.ease/plugin.xml
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/plugin.xml
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/plugin.xml
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/pom.xml b/scripting/bundles/org.eclipse.papyrus.moka.ease/pom.xml
similarity index 79%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/pom.xml
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/pom.xml
index 9be8932..b11086c 100644
--- a/bundles/scripting/org.eclipse.papyrus.moka.ease/pom.xml
+++ b/scripting/bundles/org.eclipse.papyrus.moka.ease/pom.xml
@@ -6,8 +6,8 @@
 	<!-- Parent of this POM -->
 	<parent>
 		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.scripting.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.scripting</groupId>
+		<artifactId>org.eclipse.papyrus.moka.scripting.bundles.root</artifactId>
 	</parent>
 
 	<!-- Moka project root POM (aggregator) -->
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/scripts/js/bootstrap.js b/scripting/bundles/org.eclipse.papyrus.moka.ease/scripts/js/bootstrap.js
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/scripts/js/bootstrap.js
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/scripts/js/bootstrap.js
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/scripts/python/bootstrap.py b/scripting/bundles/org.eclipse.papyrus.moka.ease/scripts/python/bootstrap.py
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/scripts/python/bootstrap.py
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/scripts/python/bootstrap.py
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/scripts/python/parametricutils.py b/scripting/bundles/org.eclipse.papyrus.moka.ease/scripts/python/parametricutils.py
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/scripts/python/parametricutils.py
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/scripts/python/parametricutils.py
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/modules/MokaParametricModule.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/modules/MokaParametricModule.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/modules/MokaParametricModule.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/modules/MokaParametricModule.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/modules/UMLUtilsModule.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/modules/UMLUtilsModule.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/modules/UMLUtilsModule.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/modules/UMLUtilsModule.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/DeferredParametricEvaluator.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/DeferredParametricEvaluator.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/DeferredParametricEvaluator.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/DeferredParametricEvaluator.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/EASEConstraintObject.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/EASEConstraintObject.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/EASEConstraintObject.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/EASEConstraintObject.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/EASEConstraintObjectFactory.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/EASEConstraintObjectFactory.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/EASEConstraintObjectFactory.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/EASEConstraintObjectFactory.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/EASEEngineManager.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/EASEEngineManager.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/EASEEngineManager.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/EASEEngineManager.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/EvaluatorLogger.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/EvaluatorLogger.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/EvaluatorLogger.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/EvaluatorLogger.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/NullPostParametricEvaluationTask.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/NullPostParametricEvaluationTask.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/NullPostParametricEvaluationTask.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/NullPostParametricEvaluationTask.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/ParametricEngineProxy.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/ParametricEngineProxy.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/ParametricEngineProxy.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/ParametricEngineProxy.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/RunnableScript.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/RunnableScript.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/RunnableScript.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/RunnableScript.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/RunnableScriptCompiler.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/RunnableScriptCompiler.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/RunnableScriptCompiler.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/RunnableScriptCompiler.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/RunnableScriptFactory.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/RunnableScriptFactory.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/RunnableScriptFactory.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/RunnableScriptFactory.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/ScriptBehaviorConstants.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/ScriptBehaviorConstants.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/ScriptBehaviorConstants.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/ScriptBehaviorConstants.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/bodyeditor/AceConstraintBlockBodyEditor.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/bodyeditor/AceConstraintBlockBodyEditor.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/bodyeditor/AceConstraintBlockBodyEditor.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/bodyeditor/AceConstraintBlockBodyEditor.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/javascript/JavascriptBodyEditor.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/javascript/JavascriptBodyEditor.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/javascript/JavascriptBodyEditor.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/javascript/JavascriptBodyEditor.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/javascript/JavascriptRunnableScriptCompiler.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/javascript/JavascriptRunnableScriptCompiler.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/javascript/JavascriptRunnableScriptCompiler.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/javascript/JavascriptRunnableScriptCompiler.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/JythonRunnableScriptCompiler.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/JythonRunnableScriptCompiler.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/JythonRunnableScriptCompiler.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/JythonRunnableScriptCompiler.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonBehaviorBlockValidator.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonBehaviorBlockValidator.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonBehaviorBlockValidator.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonBehaviorBlockValidator.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonBehaviorFunctionInfo.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonBehaviorFunctionInfo.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonBehaviorFunctionInfo.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonBehaviorFunctionInfo.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonBehaviorHelper.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonBehaviorHelper.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonBehaviorHelper.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonBehaviorHelper.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonBodyEditor.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonBodyEditor.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonBodyEditor.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonBodyEditor.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonRunnableScriptCompiler.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonRunnableScriptCompiler.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonRunnableScriptCompiler.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonRunnableScriptCompiler.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/BaseReflectiveAccessor.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/BaseReflectiveAccessor.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/BaseReflectiveAccessor.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/BaseReflectiveAccessor.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/InstanceSpecificationAccessor.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/InstanceSpecificationAccessor.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/InstanceSpecificationAccessor.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/InstanceSpecificationAccessor.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/KernelProxyAdapter.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/KernelProxyAdapter.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/KernelProxyAdapter.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/KernelProxyAdapter.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/LoggedValue.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/LoggedValue.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/LoggedValue.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/LoggedValue.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/MapProxy.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/MapProxy.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/MapProxy.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/MapProxy.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ParametricInstanceSpecGenerator.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ParametricInstanceSpecGenerator.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ParametricInstanceSpecGenerator.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ParametricInstanceSpecGenerator.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ProxyAdapter.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ProxyAdapter.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ProxyAdapter.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ProxyAdapter.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ReflectiveAccessor.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ReflectiveAccessor.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ReflectiveAccessor.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ReflectiveAccessor.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ScriptProxy.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ScriptProxy.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ScriptProxy.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ScriptProxy.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/StructuredValueAccessor.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/StructuredValueAccessor.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/StructuredValueAccessor.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/StructuredValueAccessor.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/TimeValue.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/TimeValue.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/TimeValue.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/TimeValue.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ValueIteratorProxy.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ValueIteratorProxy.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ValueIteratorProxy.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ValueIteratorProxy.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ValueListProxy.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ValueListProxy.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ValueListProxy.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ValueListProxy.java
diff --git a/bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ValueSpecificationProxyAdapter.java b/scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ValueSpecificationProxyAdapter.java
similarity index 100%
rename from bundles/scripting/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ValueSpecificationProxyAdapter.java
rename to scripting/bundles/org.eclipse.papyrus.moka.ease/src/org/eclipse/papyrus/moka/ease/semantics/proxy/ValueSpecificationProxyAdapter.java
diff --git a/bundles/scripting/pom.xml b/scripting/bundles/pom.xml
similarity index 74%
rename from bundles/scripting/pom.xml
rename to scripting/bundles/pom.xml
index 7fc4b69..fdb1336 100644
--- a/bundles/scripting/pom.xml
+++ b/scripting/bundles/pom.xml
@@ -7,12 +7,12 @@
 	<!-- Parent of this POM -->
 	<parent>
 		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.bundles.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.scripting</groupId>
+		<artifactId>org.eclipse.papyrus.moka.scripting.root</artifactId>
 	</parent>
 
 	<!-- Moka project root POM (aggregator) -->
-	<artifactId>org.eclipse.papyrus.moka.incubation.scripting.root</artifactId>
+	<artifactId>org.eclipse.papyrus.moka.scripting.bundles.root</artifactId>
 	<name>Moka Incubation Scripting Bundles</name>
 	<packaging>pom</packaging>
 
diff --git a/features/org.eclipse.papyrus.moka.fmi.scripting.feature/.project b/scripting/features/org.eclipse.papyrus.moka.fmi.scripting.feature/.project
similarity index 100%
rename from features/org.eclipse.papyrus.moka.fmi.scripting.feature/.project
rename to scripting/features/org.eclipse.papyrus.moka.fmi.scripting.feature/.project
diff --git a/features/org.eclipse.papyrus.moka.fmi.scripting.feature/about.html b/scripting/features/org.eclipse.papyrus.moka.fmi.scripting.feature/about.html
similarity index 100%
rename from features/org.eclipse.papyrus.moka.fmi.scripting.feature/about.html
rename to scripting/features/org.eclipse.papyrus.moka.fmi.scripting.feature/about.html
diff --git a/features/org.eclipse.papyrus.moka.fmi.scripting.feature/build.properties b/scripting/features/org.eclipse.papyrus.moka.fmi.scripting.feature/build.properties
similarity index 100%
rename from features/org.eclipse.papyrus.moka.fmi.scripting.feature/build.properties
rename to scripting/features/org.eclipse.papyrus.moka.fmi.scripting.feature/build.properties
diff --git a/features/org.eclipse.papyrus.moka.fmi.scripting.feature/feature.properties b/scripting/features/org.eclipse.papyrus.moka.fmi.scripting.feature/feature.properties
similarity index 100%
rename from features/org.eclipse.papyrus.moka.fmi.scripting.feature/feature.properties
rename to scripting/features/org.eclipse.papyrus.moka.fmi.scripting.feature/feature.properties
diff --git a/features/org.eclipse.papyrus.moka.fmi.scripting.feature/feature.xml b/scripting/features/org.eclipse.papyrus.moka.fmi.scripting.feature/feature.xml
similarity index 100%
rename from features/org.eclipse.papyrus.moka.fmi.scripting.feature/feature.xml
rename to scripting/features/org.eclipse.papyrus.moka.fmi.scripting.feature/feature.xml
diff --git a/features/org.eclipse.papyrus.moka.fmi.scripting.feature/pom.xml b/scripting/features/org.eclipse.papyrus.moka.fmi.scripting.feature/pom.xml
similarity index 83%
rename from features/org.eclipse.papyrus.moka.fmi.scripting.feature/pom.xml
rename to scripting/features/org.eclipse.papyrus.moka.fmi.scripting.feature/pom.xml
index 1cbb0cf..37a0a22 100644
--- a/features/org.eclipse.papyrus.moka.fmi.scripting.feature/pom.xml
+++ b/scripting/features/org.eclipse.papyrus.moka.fmi.scripting.feature/pom.xml
@@ -5,8 +5,8 @@
 	
 	<!-- Parent POM (i.e., POM located in the feature folder) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.features.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.scripting</groupId>
+		<artifactId>org.eclipse.papyrus.moka.scripting.features</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 	
diff --git a/scripting/features/pom.xml b/scripting/features/pom.xml
new file mode 100644
index 0000000..1bddc87
--- /dev/null
+++ b/scripting/features/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.scripting</groupId>
+		<artifactId>org.eclipse.papyrus.moka.scripting.root</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.scripting.features</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.moka.fmi.scripting.feature</module>
+	</modules>	
+	
+</project>
\ No newline at end of file
diff --git a/scripting/pom.xml b/scripting/pom.xml
new file mode 100644
index 0000000..a319033
--- /dev/null
+++ b/scripting/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<artifactId>org.eclipse.papyrus.moka.incubation.root</artifactId>		
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<groupId>org.eclipse.papyrus.moka.scripting</groupId>
+	<artifactId>org.eclipse.papyrus.moka.scripting.root</artifactId>
+	<version>0.7.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+		
+	<profiles>
+		<profile>
+			<id>scripting</id>	
+			<properties>
+				<targetplatform.groupId>org.eclipse.papyrus.moka.scripting</targetplatform.groupId>
+				<targetplatform.artifactId>org.eclipse.papyrus.moka.scripting.targetplatform</targetplatform.artifactId>
+				<targetplatform.version>0.7.0-SNAPSHOT</targetplatform.version>
+			</properties>
+			
+			<modules>
+				<module>bundles</module>
+				<module>features</module>
+				<module>releng</module>
+			</modules>
+		</profile>
+	</profiles>
+	
+</project>
\ No newline at end of file
diff --git a/scripting/releng/org.eclipse.papyrus.moka.scripting.p2/.project b/scripting/releng/org.eclipse.papyrus.moka.scripting.p2/.project
new file mode 100644
index 0000000..0a79233
--- /dev/null
+++ b/scripting/releng/org.eclipse.papyrus.moka.scripting.p2/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.incubation.p2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/scripting/releng/org.eclipse.papyrus.moka.scripting.p2/category.xml b/scripting/releng/org.eclipse.papyrus.moka.scripting.p2/category.xml
new file mode 100644
index 0000000..a8f7494
--- /dev/null
+++ b/scripting/releng/org.eclipse.papyrus.moka.scripting.p2/category.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+  <feature url="features/org.eclipse.papyrus.moka.scripting.feature_0.7.0.qualifier.jar" id="org.eclipse.papyrus.moka.scripting.feature" version="0.7.0.qualifier">
+      <category name="org.eclipse.papyrus.moka.incubation.category"/>
+   </feature>
+  
+  <category-def name="org.eclipse.papyrus.moka.incubation.category" label="Papyrus Moka Incubation">
+      <description>
+         Papyrus Moka Incubation features
+      </description>
+   </category-def>
+</site>
diff --git a/scripting/releng/org.eclipse.papyrus.moka.scripting.p2/pom.xml b/scripting/releng/org.eclipse.papyrus.moka.scripting.p2/pom.xml
new file mode 100644
index 0000000..83d24d9
--- /dev/null
+++ b/scripting/releng/org.eclipse.papyrus.moka.scripting.p2/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.scripting</groupId>
+		<artifactId>org.eclipse.papyrus.moka.scripting.releng</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.scripting.p2</artifactId>
+	<packaging>eclipse-repository</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/scripting/releng/pom.xml b/scripting/releng/pom.xml
new file mode 100644
index 0000000..24d2d18
--- /dev/null
+++ b/scripting/releng/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.scripting</groupId>
+		<artifactId>org.eclipse.papyrus.moka.scripting.root</artifactId>		
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.scripting.releng</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.moka.scripting.p2</module>
+		<module>targetplatform</module>
+	</modules>	
+	
+</project>
\ No newline at end of file
diff --git a/scripting/releng/targetplatform/org.eclipse.papyrus.moka.scripting.targetplatform.target b/scripting/releng/targetplatform/org.eclipse.papyrus.moka.scripting.targetplatform.target
new file mode 100644
index 0000000..f20facd
--- /dev/null
+++ b/scripting/releng/targetplatform/org.eclipse.papyrus.moka.scripting.targetplatform.target
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Moka incubation - Scripting" sequenceNumber="1626440931">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse" location="http://download.eclipse.org/releases/2020-12"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.moka.feature.feature.group" version="0.0.0"/>
+      <repository id="moka" location="https://ci.eclipse.org/papyrus/view/Moka/job/papyrus-moka-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.moka.p2/target/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.sysml16.feature.feature.group" version="0.0.0"/>
+      <repository id="sysml16" location="https://ci.eclipse.org/papyrus/job/papyrus-sysml16-master/lastSuccessfulBuild/artifact/sources/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.ease.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.aceeditor" version="0.0.0"/>
+      <repository id="papyrus-ease" location="https://ci.eclipse.org/papyrus/view/EASE/job/papyrus-ease-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.ease.p2/target/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ease.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ease.lang.python.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ease.lang.javascript.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ease.lang.python.jython" version="0.0.0"/>
+      <unit id="org.eclipse.ease.modules.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ease.modules.modeling.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ease.ui.feature.feature.group" version="0.0.0"/>
+      <repository id="ease" location="https://download.eclipse.org/ease/integration/nightly/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.fx.ide.feature.feature.group" version="0.0.0"/>
+      <repository id="efxclipse" location="https://download.eclipse.org/efxclipse/updates-released/3.5.0/site/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.py4j.feature.feature.group" version="0.0.0"/>
+      <repository id="py4j" location="http://eclipse.py4j.org/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ease.engine.jython.feature.feature.group" version="0.0.0"/>
+      <repository location="https://eclipse-ease-addons.github.io/org.eclipse.ease.engines.p2/latest"/>
+    </location>
+  </locations>
+</target>
diff --git a/scripting/releng/targetplatform/org.eclipse.papyrus.moka.scripting.targetplatform.tpd b/scripting/releng/targetplatform/org.eclipse.papyrus.moka.scripting.targetplatform.tpd
new file mode 100644
index 0000000..533f8c7
--- /dev/null
+++ b/scripting/releng/targetplatform/org.eclipse.papyrus.moka.scripting.targetplatform.tpd
@@ -0,0 +1,41 @@
+target "Moka incubation - Scripting" with source requirements
+
+location "http://download.eclipse.org/releases/2020-12" eclipse {
+	org.eclipse.platform.feature.group lazy
+	org.eclipse.papyrus.sdk.feature.feature.group lazy
+}
+
+location "https://ci.eclipse.org/papyrus/view/Moka/job/papyrus-moka-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.moka.p2/target/repository/" moka {
+	org.eclipse.papyrus.moka.feature.feature.group lazy
+}
+
+location "https://ci.eclipse.org/papyrus/job/papyrus-sysml16-master/lastSuccessfulBuild/artifact/sources/repository/" sysml16 {
+	org.eclipse.papyrus.sysml16.feature.feature.group lazy
+}
+
+location "https://ci.eclipse.org/papyrus/view/EASE/job/papyrus-ease-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.ease.p2/target/repository/" papyrus-ease {
+	org.eclipse.papyrus.ease.feature.feature.group lazy
+	org.eclipse.papyrus.aceeditor lazy
+}
+
+location "https://download.eclipse.org/ease/integration/nightly/" ease {
+	org.eclipse.ease.feature.feature.group lazy
+	org.eclipse.ease.lang.python.feature.source.feature.group lazy
+	org.eclipse.ease.lang.javascript.feature.feature.group lazy
+	org.eclipse.ease.lang.python.jython lazy
+    org.eclipse.ease.modules.feature.feature.group lazy
+    org.eclipse.ease.modules.modeling.feature.feature.group lazy
+	org.eclipse.ease.ui.feature.feature.group lazy
+}
+
+location "https://download.eclipse.org/efxclipse/updates-released/3.5.0/site/" efxclipse {
+	org.eclipse.fx.ide.feature.feature.group lazy
+}
+
+location "http://eclipse.py4j.org/" py4j {
+	org.py4j.feature.feature.group lazy
+}
+
+location "https://eclipse-ease-addons.github.io/org.eclipse.ease.engines.p2/latest" {
+	org.eclipse.ease.engine.jython.feature.feature.group lazy
+}
\ No newline at end of file
diff --git a/scripting/releng/targetplatform/pom.xml b/scripting/releng/targetplatform/pom.xml
new file mode 100644
index 0000000..ecc76cc
--- /dev/null
+++ b/scripting/releng/targetplatform/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.scripting</groupId>
+	<artifactId>org.eclipse.papyrus.moka.scripting.releng</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.scripting.targetplatform</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	
+</project>
\ No newline at end of file
diff --git a/simex/.project b/simex/.project
new file mode 100644
index 0000000..9a643f0
--- /dev/null
+++ b/simex/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>simex</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/.classpath b/simex/bundles/org.eclipse.papyrus.moka.simex/.classpath
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/.classpath
rename to simex/bundles/org.eclipse.papyrus.moka.simex/.classpath
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/.project b/simex/bundles/org.eclipse.papyrus.moka.simex/.project
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/.project
rename to simex/bundles/org.eclipse.papyrus.moka.simex/.project
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/META-INF/MANIFEST.MF b/simex/bundles/org.eclipse.papyrus.moka.simex/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/META-INF/MANIFEST.MF
rename to simex/bundles/org.eclipse.papyrus.moka.simex/META-INF/MANIFEST.MF
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/about.html b/simex/bundles/org.eclipse.papyrus.moka.simex/about.html
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/about.html
rename to simex/bundles/org.eclipse.papyrus.moka.simex/about.html
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/build.properties b/simex/bundles/org.eclipse.papyrus.moka.simex/build.properties
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/build.properties
rename to simex/bundles/org.eclipse.papyrus.moka.simex/build.properties
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/config/simex.architecture b/simex/bundles/org.eclipse.papyrus.moka.simex/config/simex.architecture
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/config/simex.architecture
rename to simex/bundles/org.eclipse.papyrus.moka.simex/config/simex.architecture
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/css/activity-canonical.css b/simex/bundles/org.eclipse.papyrus.moka.simex/css/activity-canonical.css
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/css/activity-canonical.css
rename to simex/bundles/org.eclipse.papyrus.moka.simex/css/activity-canonical.css
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/dnd-messages.properties b/simex/bundles/org.eclipse.papyrus.moka.simex/dnd-messages.properties
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/dnd-messages.properties
rename to simex/bundles/org.eclipse.papyrus.moka.simex/dnd-messages.properties
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/palette/simexActivity.paletteconfiguration b/simex/bundles/org.eclipse.papyrus.moka.simex/palette/simexActivity.paletteconfiguration
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/palette/simexActivity.paletteconfiguration
rename to simex/bundles/org.eclipse.papyrus.moka.simex/palette/simexActivity.paletteconfiguration
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/palette/simexClass.paletteconfiguration b/simex/bundles/org.eclipse.papyrus.moka.simex/palette/simexClass.paletteconfiguration
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/palette/simexClass.paletteconfiguration
rename to simex/bundles/org.eclipse.papyrus.moka.simex/palette/simexClass.paletteconfiguration
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/palette/simexComposite.paletteconfiguration b/simex/bundles/org.eclipse.papyrus.moka.simex/palette/simexComposite.paletteconfiguration
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/palette/simexComposite.paletteconfiguration
rename to simex/bundles/org.eclipse.papyrus.moka.simex/palette/simexComposite.paletteconfiguration
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/plugin.xml b/simex/bundles/org.eclipse.papyrus.moka.simex/plugin.xml
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/plugin.xml
rename to simex/bundles/org.eclipse.papyrus.moka.simex/plugin.xml
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/pom.xml b/simex/bundles/org.eclipse.papyrus.moka.simex/pom.xml
similarity index 80%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/pom.xml
rename to simex/bundles/org.eclipse.papyrus.moka.simex/pom.xml
index 40e9450..f4d6b98 100644
--- a/bundles/simex/org.eclipse.papyrus.moka.simex/pom.xml
+++ b/simex/bundles/org.eclipse.papyrus.moka.simex/pom.xml
@@ -5,8 +5,8 @@
 	
 	<!-- Parent POM (Tools) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.simex.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.simex</groupId>
+		<artifactId>org.eclipse.papyrus.moka.simex.bundles.root</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/Activator.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/Activator.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/Activator.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/Activator.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ActivityNodePinUpdateEditHelperAdvice.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ActivityNodePinUpdateEditHelperAdvice.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ActivityNodePinUpdateEditHelperAdvice.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ActivityNodePinUpdateEditHelperAdvice.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/AddStructuralFeatureActionEditHelperAdvice.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/AddStructuralFeatureActionEditHelperAdvice.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/AddStructuralFeatureActionEditHelperAdvice.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/AddStructuralFeatureActionEditHelperAdvice.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/LinkActionEditHelperAdvice.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/LinkActionEditHelperAdvice.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/LinkActionEditHelperAdvice.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/LinkActionEditHelperAdvice.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/LoopNodeEditHelperAdvice.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/LoopNodeEditHelperAdvice.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/LoopNodeEditHelperAdvice.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/LoopNodeEditHelperAdvice.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ReadIsClassifiedObjectActionEditHelperAdvice.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ReadIsClassifiedObjectActionEditHelperAdvice.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ReadIsClassifiedObjectActionEditHelperAdvice.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ReadIsClassifiedObjectActionEditHelperAdvice.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ReadSelfActionEditHelperAdvice.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ReadSelfActionEditHelperAdvice.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ReadSelfActionEditHelperAdvice.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ReadSelfActionEditHelperAdvice.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/SendSignalActionEditHelperAdvice.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/SendSignalActionEditHelperAdvice.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/SendSignalActionEditHelperAdvice.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/SendSignalActionEditHelperAdvice.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/SignalEditHelperAdvice.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/SignalEditHelperAdvice.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/SignalEditHelperAdvice.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/SignalEditHelperAdvice.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/StartObjectBehaviorActionEditHelperAdvice.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/StartObjectBehaviorActionEditHelperAdvice.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/StartObjectBehaviorActionEditHelperAdvice.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/StartObjectBehaviorActionEditHelperAdvice.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/TestIdentityActionEditHelperAdvice.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/TestIdentityActionEditHelperAdvice.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/TestIdentityActionEditHelperAdvice.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/TestIdentityActionEditHelperAdvice.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ValueSpecificationActionEditHelperAdvice.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ValueSpecificationActionEditHelperAdvice.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ValueSpecificationActionEditHelperAdvice.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ValueSpecificationActionEditHelperAdvice.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/commands/AbstractPinUpdateCommand.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/commands/AbstractPinUpdateCommand.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/commands/AbstractPinUpdateCommand.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/commands/AbstractPinUpdateCommand.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/commands/PinUpdateICommandFactory.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/commands/PinUpdateICommandFactory.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/commands/PinUpdateICommandFactory.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/commands/PinUpdateICommandFactory.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropAcceptCallActionCommand.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropAcceptCallActionCommand.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropAcceptCallActionCommand.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropAcceptCallActionCommand.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropAcceptEventActionCommand.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropAcceptEventActionCommand.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropAcceptEventActionCommand.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropAcceptEventActionCommand.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropGenericCommand.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropGenericCommand.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropGenericCommand.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropGenericCommand.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropLinkActionCommand.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropLinkActionCommand.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropLinkActionCommand.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropLinkActionCommand.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AbstractDropInActivityStrategy.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AbstractDropInActivityStrategy.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AbstractDropInActivityStrategy.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AbstractDropInActivityStrategy.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ActivityToCallBehaviorActionStrategy.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ActivityToCallBehaviorActionStrategy.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ActivityToCallBehaviorActionStrategy.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ActivityToCallBehaviorActionStrategy.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToClearAssociationActionStrategy.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToClearAssociationActionStrategy.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToClearAssociationActionStrategy.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToClearAssociationActionStrategy.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToCreateLinkAction.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToCreateLinkAction.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToCreateLinkAction.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToCreateLinkAction.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToDestroyLinkAction.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToDestroyLinkAction.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToDestroyLinkAction.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToDestroyLinkAction.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToReadLinkAction.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToReadLinkAction.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToReadLinkAction.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToReadLinkAction.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/BehaviorToCallBehaviorActionStrategy.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/BehaviorToCallBehaviorActionStrategy.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/BehaviorToCallBehaviorActionStrategy.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/BehaviorToCallBehaviorActionStrategy.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/BehaviorToReduceActionStrategy.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/BehaviorToReduceActionStrategy.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/BehaviorToReduceActionStrategy.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/BehaviorToReduceActionStrategy.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToCreateObjectActionStrategy.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToCreateObjectActionStrategy.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToCreateObjectActionStrategy.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToCreateObjectActionStrategy.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToReadExtentActionStrategy.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToReadExtentActionStrategy.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToReadExtentActionStrategy.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToReadExtentActionStrategy.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToReadIsClassifiedObjectActionStrategy.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToReadIsClassifiedObjectActionStrategy.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToReadIsClassifiedObjectActionStrategy.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToReadIsClassifiedObjectActionStrategy.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToUnmarshallActionStrategy.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToUnmarshallActionStrategy.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToUnmarshallActionStrategy.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToUnmarshallActionStrategy.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/DndMessages.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/DndMessages.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/DndMessages.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/DndMessages.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/OperationToAcceptCallActionStrategy.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/OperationToAcceptCallActionStrategy.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/OperationToAcceptCallActionStrategy.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/OperationToAcceptCallActionStrategy.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/OperationToCallOperationActionStrategy.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/OperationToCallOperationActionStrategy.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/OperationToCallOperationActionStrategy.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/OperationToCallOperationActionStrategy.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ParameterToActivityParameterNodeStrategy.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ParameterToActivityParameterNodeStrategy.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ParameterToActivityParameterNodeStrategy.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ParameterToActivityParameterNodeStrategy.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToAddStructuralFeatureValueActionStrategy.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToAddStructuralFeatureValueActionStrategy.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToAddStructuralFeatureValueActionStrategy.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToAddStructuralFeatureValueActionStrategy.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToClearStructuralFeatureActionStrategy.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToClearStructuralFeatureActionStrategy.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToClearStructuralFeatureActionStrategy.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToClearStructuralFeatureActionStrategy.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToReadStructuralFeatureActionStrategy.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToReadStructuralFeatureActionStrategy.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToReadStructuralFeatureActionStrategy.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToReadStructuralFeatureActionStrategy.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToAcceptEventActionStrategy.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToAcceptEventActionStrategy.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToAcceptEventActionStrategy.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToAcceptEventActionStrategy.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToBroadcastActionStrategy.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToBroadcastActionStrategy.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToBroadcastActionStrategy.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToBroadcastActionStrategy.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToSendSignalActionStrategy.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToSendSignalActionStrategy.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToSendSignalActionStrategy.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToSendSignalActionStrategy.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/EventUtil.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/EventUtil.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/EventUtil.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/EventUtil.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/FoundationalModelLibraryUtils.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/FoundationalModelLibraryUtils.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/FoundationalModelLibraryUtils.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/FoundationalModelLibraryUtils.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/PinUtils.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/PinUtils.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/PinUtils.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/PinUtils.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/RegisteredLibraryLoadAndSearchUtils.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/RegisteredLibraryLoadAndSearchUtils.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/RegisteredLibraryLoadAndSearchUtils.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/RegisteredLibraryLoadAndSearchUtils.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/RequestUtils.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/RequestUtils.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/RequestUtils.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/RequestUtils.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/UMLPrimitiveTypesUtils.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/UMLPrimitiveTypesUtils.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/UMLPrimitiveTypesUtils.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/UMLPrimitiveTypesUtils.java
diff --git a/bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/viewpoint/SimexViewpointListener.java b/simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/viewpoint/SimexViewpointListener.java
similarity index 100%
rename from bundles/simex/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/viewpoint/SimexViewpointListener.java
rename to simex/bundles/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/viewpoint/SimexViewpointListener.java
diff --git a/bundles/simex/pom.xml b/simex/bundles/pom.xml
similarity index 74%
rename from bundles/simex/pom.xml
rename to simex/bundles/pom.xml
index 89a0acf..06392ba 100644
--- a/bundles/simex/pom.xml
+++ b/simex/bundles/pom.xml
@@ -6,13 +6,13 @@
 
 	<!-- Parent of this POM -->
 	<parent>
+		<groupId>org.eclipse.papyrus.moka.simex</groupId>
+		<artifactId>org.eclipse.papyrus.moka.simex.root</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.bundles.root</artifactId>
 	</parent>
 
 	<!-- Moka project root POM (aggregator) -->
-	<artifactId>org.eclipse.papyrus.moka.incubation.simex.root</artifactId>
+	<artifactId>org.eclipse.papyrus.moka.simex.bundles.root</artifactId>
 	<name>Moka Incubation Simex</name>
 	<packaging>pom</packaging>
 
diff --git a/features/org.eclipse.papyrus.moka.simex.feature/.project b/simex/features/org.eclipse.papyrus.moka.simex.feature/.project
similarity index 100%
rename from features/org.eclipse.papyrus.moka.simex.feature/.project
rename to simex/features/org.eclipse.papyrus.moka.simex.feature/.project
diff --git a/features/org.eclipse.papyrus.moka.simex.feature/about.html b/simex/features/org.eclipse.papyrus.moka.simex.feature/about.html
similarity index 100%
rename from features/org.eclipse.papyrus.moka.simex.feature/about.html
rename to simex/features/org.eclipse.papyrus.moka.simex.feature/about.html
diff --git a/features/org.eclipse.papyrus.moka.simex.feature/build.properties b/simex/features/org.eclipse.papyrus.moka.simex.feature/build.properties
similarity index 100%
rename from features/org.eclipse.papyrus.moka.simex.feature/build.properties
rename to simex/features/org.eclipse.papyrus.moka.simex.feature/build.properties
diff --git a/features/org.eclipse.papyrus.moka.simex.feature/feature.properties b/simex/features/org.eclipse.papyrus.moka.simex.feature/feature.properties
similarity index 100%
rename from features/org.eclipse.papyrus.moka.simex.feature/feature.properties
rename to simex/features/org.eclipse.papyrus.moka.simex.feature/feature.properties
diff --git a/features/org.eclipse.papyrus.moka.simex.feature/feature.xml b/simex/features/org.eclipse.papyrus.moka.simex.feature/feature.xml
similarity index 100%
rename from features/org.eclipse.papyrus.moka.simex.feature/feature.xml
rename to simex/features/org.eclipse.papyrus.moka.simex.feature/feature.xml
diff --git a/features/org.eclipse.papyrus.moka.simex.feature/pom.xml b/simex/features/org.eclipse.papyrus.moka.simex.feature/pom.xml
similarity index 80%
rename from features/org.eclipse.papyrus.moka.simex.feature/pom.xml
rename to simex/features/org.eclipse.papyrus.moka.simex.feature/pom.xml
index 9773721..7a78e4d 100644
--- a/features/org.eclipse.papyrus.moka.simex.feature/pom.xml
+++ b/simex/features/org.eclipse.papyrus.moka.simex.feature/pom.xml
@@ -3,8 +3,8 @@
 	
 	<!-- Parent POM (i.e., POM located in the feature folder) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.features.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.simex</groupId>
+		<artifactId>org.eclipse.papyrus.moka.simex.features</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 	
diff --git a/simex/features/pom.xml b/simex/features/pom.xml
new file mode 100644
index 0000000..69de9df
--- /dev/null
+++ b/simex/features/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.simex</groupId>
+		<artifactId>org.eclipse.papyrus.moka.simex.root</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.simex.features</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.moka.simex.feature</module>
+	</modules>	
+	
+</project>
\ No newline at end of file
diff --git a/simex/pom.xml b/simex/pom.xml
new file mode 100644
index 0000000..0ef8679
--- /dev/null
+++ b/simex/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<artifactId>org.eclipse.papyrus.moka.incubation.root</artifactId>		
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<groupId>org.eclipse.papyrus.moka.simex</groupId>
+	<artifactId>org.eclipse.papyrus.moka.simex.root</artifactId>
+	<version>0.7.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+		
+	<profiles>
+		<profile>
+			<id>simex</id>	
+			<properties>
+				<targetplatform.groupId>org.eclipse.papyrus.moka.simex</targetplatform.groupId>
+				<targetplatform.artifactId>org.eclipse.papyrus.moka.simex.targetplatform</targetplatform.artifactId>
+				<targetplatform.version>0.7.0-SNAPSHOT</targetplatform.version>
+			</properties>
+			
+			<modules>
+				<module>bundles</module>
+				<module>features</module>
+				<module>releng</module>
+			</modules>
+		</profile>
+	</profiles>
+	
+</project>
\ No newline at end of file
diff --git a/simex/releng/org.eclipse.papyrus.moka.simex.p2/.project b/simex/releng/org.eclipse.papyrus.moka.simex.p2/.project
new file mode 100644
index 0000000..0a79233
--- /dev/null
+++ b/simex/releng/org.eclipse.papyrus.moka.simex.p2/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.incubation.p2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/simex/releng/org.eclipse.papyrus.moka.simex.p2/category.xml b/simex/releng/org.eclipse.papyrus.moka.simex.p2/category.xml
new file mode 100644
index 0000000..e4ae607
--- /dev/null
+++ b/simex/releng/org.eclipse.papyrus.moka.simex.p2/category.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+  <feature url="features/org.eclipse.papyrus.moka.simex.feature_0.7.0.qualifier.jar" id="org.eclipse.papyrus.moka.simex.feature" version="0.7.0.qualifier">
+      <category name="org.eclipse.papyrus.moka.incubation.category"/>
+   </feature>
+  
+  <category-def name="org.eclipse.papyrus.moka.incubation.category" label="Papyrus Moka Incubation">
+      <description>
+         Papyrus Moka Incubation features
+      </description>
+   </category-def>
+</site>
diff --git a/simex/releng/org.eclipse.papyrus.moka.simex.p2/pom.xml b/simex/releng/org.eclipse.papyrus.moka.simex.p2/pom.xml
new file mode 100644
index 0000000..a9ca88f
--- /dev/null
+++ b/simex/releng/org.eclipse.papyrus.moka.simex.p2/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.simex</groupId>
+		<artifactId>org.eclipse.papyrus.moka.simex.releng</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.simex.p2</artifactId>
+	<packaging>eclipse-repository</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/simex/releng/pom.xml b/simex/releng/pom.xml
new file mode 100644
index 0000000..1980b07
--- /dev/null
+++ b/simex/releng/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.simex</groupId>
+		<artifactId>org.eclipse.papyrus.moka.simex.root</artifactId>		
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.simex.releng</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.moka.simex.p2</module>
+		<module>targetplatform</module>
+	</modules>	
+	
+</project>
\ No newline at end of file
diff --git a/simex/releng/targetplatform/org.eclipse.papyrus.moka.simex.targetplatform.target b/simex/releng/targetplatform/org.eclipse.papyrus.moka.simex.targetplatform.target
new file mode 100644
index 0000000..64056ec
--- /dev/null
+++ b/simex/releng/targetplatform/org.eclipse.papyrus.moka.simex.targetplatform.target
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Moka incubation - Simex" sequenceNumber="1626427019">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse" location="http://download.eclipse.org/releases/2020-12"/>
+    </location>
+  </locations>
+</target>
diff --git a/simex/releng/targetplatform/org.eclipse.papyrus.moka.simex.targetplatform.tpd b/simex/releng/targetplatform/org.eclipse.papyrus.moka.simex.targetplatform.tpd
new file mode 100644
index 0000000..66387f4
--- /dev/null
+++ b/simex/releng/targetplatform/org.eclipse.papyrus.moka.simex.targetplatform.tpd
@@ -0,0 +1,6 @@
+target "Moka incubation - Simex" with source requirements
+
+location "http://download.eclipse.org/releases/2020-12" eclipse {
+	org.eclipse.platform.feature.group lazy
+	org.eclipse.papyrus.sdk.feature.feature.group lazy
+}
diff --git a/simex/releng/targetplatform/pom.xml b/simex/releng/targetplatform/pom.xml
new file mode 100644
index 0000000..db5f616
--- /dev/null
+++ b/simex/releng/targetplatform/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.simex</groupId>
+		<artifactId>org.eclipse.papyrus.moka.simex.releng</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.simex.targetplatform</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	
+</project>
\ No newline at end of file
diff --git a/suml/.project b/suml/.project
new file mode 100644
index 0000000..1c3762b
--- /dev/null
+++ b/suml/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>suml</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.ease/.classpath b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.ease/.classpath
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml.ease/.classpath
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml.ease/.classpath
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.ease/.gitignore b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.ease/.gitignore
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml.ease/.gitignore
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml.ease/.gitignore
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.ease/.project b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.ease/.project
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml.ease/.project
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml.ease/.project
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.ease/META-INF/MANIFEST.MF b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.ease/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml.ease/META-INF/MANIFEST.MF
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml.ease/META-INF/MANIFEST.MF
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.ease/build.properties b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.ease/build.properties
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml.ease/build.properties
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml.ease/build.properties
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.ease/pom.xml b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.ease/pom.xml
similarity index 79%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml.ease/pom.xml
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml.ease/pom.xml
index f3c5eb3..0b10eb9 100644
--- a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.ease/pom.xml
+++ b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.ease/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>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.engine.suml.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.engine.suml</groupId>
+		<artifactId>org.eclipse.papyrus.moka.engine.suml.bundles.root</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 	
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.ease/src/org/eclipse/papyrus/moka/engine/suml/ease/EASEBodyScriptConstants.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.ease/src/org/eclipse/papyrus/moka/engine/suml/ease/EASEBodyScriptConstants.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml.ease/src/org/eclipse/papyrus/moka/engine/suml/ease/EASEBodyScriptConstants.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml.ease/src/org/eclipse/papyrus/moka/engine/suml/ease/EASEBodyScriptConstants.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.ease/src/org/eclipse/papyrus/moka/engine/suml/ease/EASEBodyScriptFactory.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.ease/src/org/eclipse/papyrus/moka/engine/suml/ease/EASEBodyScriptFactory.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml.ease/src/org/eclipse/papyrus/moka/engine/suml/ease/EASEBodyScriptFactory.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml.ease/src/org/eclipse/papyrus/moka/engine/suml/ease/EASEBodyScriptFactory.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/.classpath b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/.classpath
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/.classpath
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/.classpath
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/.gitignore b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/.gitignore
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/.gitignore
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/.gitignore
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/.project b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/.project
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/.project
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/.project
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/META-INF/MANIFEST.MF b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/META-INF/MANIFEST.MF
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/META-INF/MANIFEST.MF
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/build.properties b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/build.properties
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/build.properties
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/build.properties
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/plugin.xml b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/plugin.xml
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/plugin.xml
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/plugin.xml
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/pom.xml b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/pom.xml
similarity index 79%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/pom.xml
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/pom.xml
index 159607e..6b67628 100644
--- a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/pom.xml
+++ b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/pom.xml
@@ -4,8 +4,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>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.engine.suml.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.engine.suml</groupId>
+		<artifactId>org.eclipse.papyrus.moka.engine.suml.bundles.root</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 	
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/scripts/Bootstrap.py b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/scripts/Bootstrap.py
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/scripts/Bootstrap.py
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/scripts/Bootstrap.py
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonBehaviorFunctionInfo.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonBehaviorFunctionInfo.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonBehaviorFunctionInfo.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/src/org/eclipse/papyrus/moka/ease/parametric/python/PythonBehaviorFunctionInfo.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/src/org/eclipse/papyrus/moka/engine/suml/python/PythonBodyScriptCodeGen.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/src/org/eclipse/papyrus/moka/engine/suml/python/PythonBodyScriptCodeGen.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/src/org/eclipse/papyrus/moka/engine/suml/python/PythonBodyScriptCodeGen.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/src/org/eclipse/papyrus/moka/engine/suml/python/PythonBodyScriptCodeGen.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/src/org/eclipse/papyrus/moka/engine/suml/python/PythonBodyScriptFactory.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/src/org/eclipse/papyrus/moka/engine/suml/python/PythonBodyScriptFactory.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/src/org/eclipse/papyrus/moka/engine/suml/python/PythonBodyScriptFactory.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/src/org/eclipse/papyrus/moka/engine/suml/python/PythonBodyScriptFactory.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/src/org/eclipse/papyrus/moka/engine/suml/python/PythonBridgeEngine.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/src/org/eclipse/papyrus/moka/engine/suml/python/PythonBridgeEngine.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/src/org/eclipse/papyrus/moka/engine/suml/python/PythonBridgeEngine.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/src/org/eclipse/papyrus/moka/engine/suml/python/PythonBridgeEngine.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/src/org/eclipse/papyrus/moka/engine/suml/python/PythonObjectBridge.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/src/org/eclipse/papyrus/moka/engine/suml/python/PythonObjectBridge.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml.python/src/org/eclipse/papyrus/moka/engine/suml/python/PythonObjectBridge.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml.python/src/org/eclipse/papyrus/moka/engine/suml/python/PythonObjectBridge.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/.classpath b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/.classpath
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/.classpath
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/.classpath
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/.gitignore b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/.gitignore
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/.gitignore
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/.gitignore
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/.project b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/.project
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/.project
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/.project
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/META-INF/MANIFEST.MF b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/META-INF/MANIFEST.MF
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/META-INF/MANIFEST.MF
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/build.properties b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/build.properties
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/build.properties
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/build.properties
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/plugin.xml b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/plugin.xml
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/plugin.xml
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/plugin.xml
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/pom.xml b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/pom.xml
similarity index 78%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/pom.xml
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/pom.xml
index 0a53814..b2a7ae6 100644
--- a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/pom.xml
+++ b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/pom.xml
@@ -4,8 +4,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>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.engine.suml.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.engine.suml</groupId>
+		<artifactId>org.eclipse.papyrus.moka.engine.suml.bundles.root</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/schema/bodyScriptFactory.exsd b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/schema/bodyScriptFactory.exsd
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/schema/bodyScriptFactory.exsd
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/schema/bodyScriptFactory.exsd
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/BodyScriptFactoryRegistry.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/BodyScriptFactoryRegistry.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/BodyScriptFactoryRegistry.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/BodyScriptFactoryRegistry.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/SUMLAnimationService.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/SUMLAnimationService.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/SUMLAnimationService.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/SUMLAnimationService.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/SUMLDebugService.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/SUMLDebugService.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/SUMLDebugService.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/SUMLDebugService.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/SUMLExecutionEngine.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/SUMLExecutionEngine.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/SUMLExecutionEngine.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/SUMLExecutionEngine.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/ScriptExecutionFactory.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/ScriptExecutionFactory.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/ScriptExecutionFactory.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/ScriptExecutionFactory.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/ScriptExecutionFactoryRegistry.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/ScriptExecutionFactoryRegistry.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/ScriptExecutionFactoryRegistry.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/ScriptExecutionFactoryRegistry.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/AccessAdapterRegistry.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/AccessAdapterRegistry.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/AccessAdapterRegistry.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/AccessAdapterRegistry.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/ComponentAccessor.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/ComponentAccessor.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/ComponentAccessor.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/ComponentAccessor.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/ComponentAdapter.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/ComponentAdapter.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/ComponentAdapter.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/ComponentAdapter.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/IndexableMapAccess.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/IndexableMapAccess.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/IndexableMapAccess.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/IndexableMapAccess.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/ValueTypeConverter.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/ValueTypeConverter.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/ValueTypeConverter.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/ValueTypeConverter.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/ValueTypeWrapper.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/ValueTypeWrapper.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/ValueTypeWrapper.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/ValueTypeWrapper.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/locus/FeatureValueAdapter.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/locus/FeatureValueAdapter.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/locus/FeatureValueAdapter.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/locus/FeatureValueAdapter.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/locus/IValueConverter.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/locus/IValueConverter.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/locus/IValueConverter.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/locus/IValueConverter.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/locus/ParameterValueAdapter.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/locus/ParameterValueAdapter.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/locus/ParameterValueAdapter.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/locus/ParameterValueAdapter.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/structures/ArrayIndexableMapAccess.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/structures/ArrayIndexableMapAccess.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/structures/ArrayIndexableMapAccess.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/structures/ArrayIndexableMapAccess.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/structures/ListAccess.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/structures/ListAccess.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/structures/ListAccess.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/structures/ListAccess.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/structures/MapAccess.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/structures/MapAccess.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/structures/MapAccess.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/structures/MapAccess.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/structures/OperationAccess.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/structures/OperationAccess.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/structures/OperationAccess.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/structures/OperationAccess.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/uml/SlotAdapter.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/uml/SlotAdapter.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/uml/SlotAdapter.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/uml/SlotAdapter.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/uml/ValueSpecificationConverter.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/uml/ValueSpecificationConverter.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/uml/ValueSpecificationConverter.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/accessor/uml/ValueSpecificationConverter.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/actions/OpaqueActionActivation.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/actions/OpaqueActionActivation.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/actions/OpaqueActionActivation.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/actions/OpaqueActionActivation.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/loci/SUML_ExecutionFactory.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/loci/SUML_ExecutionFactory.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/loci/SUML_ExecutionFactory.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/loci/SUML_ExecutionFactory.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/loci/SUML_OpaqueBehaviorExecution.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/loci/SUML_OpaqueBehaviorExecution.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/loci/SUML_OpaqueBehaviorExecution.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/loci/SUML_OpaqueBehaviorExecution.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/loci/SUML_OpaqueExpressionEvaluation.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/loci/SUML_OpaqueExpressionEvaluation.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/loci/SUML_OpaqueExpressionEvaluation.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/loci/SUML_OpaqueExpressionEvaluation.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/opaquebehaviors/LocusAdapter.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/opaquebehaviors/LocusAdapter.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/opaquebehaviors/LocusAdapter.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/opaquebehaviors/LocusAdapter.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/opaquebehaviors/SUMLScriptExecutionFactory.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/opaquebehaviors/SUMLScriptExecutionFactory.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/opaquebehaviors/SUMLScriptExecutionFactory.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/opaquebehaviors/SUMLScriptExecutionFactory.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/opaquebehaviors/ScriptExecution.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/opaquebehaviors/ScriptExecution.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/opaquebehaviors/ScriptExecution.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/opaquebehaviors/ScriptExecution.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/opaquebehaviors/ScriptExecutionContext.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/opaquebehaviors/ScriptExecutionContext.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/opaquebehaviors/ScriptExecutionContext.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/opaquebehaviors/ScriptExecutionContext.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/script/IBodyScript.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/script/IBodyScript.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/script/IBodyScript.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/script/IBodyScript.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/script/IBodyScriptFactory.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/script/IBodyScriptFactory.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/script/IBodyScriptFactory.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/script/IBodyScriptFactory.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/script/gen/CodeGenHelper.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/script/gen/CodeGenHelper.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/script/gen/CodeGenHelper.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/script/gen/CodeGenHelper.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/tasks/RootOpaqueBehaviorTaskExecution.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/tasks/RootOpaqueBehaviorTaskExecution.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/tasks/RootOpaqueBehaviorTaskExecution.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/tasks/RootOpaqueBehaviorTaskExecution.java
diff --git a/bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/tasks/SUMLTaskExecutionFactory.java b/suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/tasks/SUMLTaskExecutionFactory.java
similarity index 100%
rename from bundles/suml/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/tasks/SUMLTaskExecutionFactory.java
rename to suml/bundles/org.eclipse.papyrus.moka.engine.suml/src/org/eclipse/papyrus/moka/engine/suml/tasks/SUMLTaskExecutionFactory.java
diff --git a/bundles/suml/pom.xml b/suml/bundles/pom.xml
similarity index 79%
rename from bundles/suml/pom.xml
rename to suml/bundles/pom.xml
index 7e8cd2d..25ba9d6 100644
--- a/bundles/suml/pom.xml
+++ b/suml/bundles/pom.xml
@@ -6,13 +6,13 @@
 
 	<!-- Parent of this POM -->
 	<parent>
+		<groupId>org.eclipse.papyrus.moka.engine.suml</groupId>
+		<artifactId>org.eclipse.papyrus.moka.engine.suml.root</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.bundles.root</artifactId>
 	</parent>
 
 	<!-- Moka project root POM (aggregator) -->
-	<artifactId>org.eclipse.papyrus.moka.engine.suml.root</artifactId>
+	<artifactId>org.eclipse.papyrus.moka.engine.suml.bundles.root</artifactId>
 	<name>Moka Incubation Scripting UML Engine</name>
 	<packaging>pom</packaging>
 
diff --git a/features/org.eclipse.papyrus.moka.engine.suml.feature/build.properties b/suml/features/org.eclipse.papyrus.moka.engine.suml.feature/build.properties
similarity index 100%
rename from features/org.eclipse.papyrus.moka.engine.suml.feature/build.properties
rename to suml/features/org.eclipse.papyrus.moka.engine.suml.feature/build.properties
diff --git a/features/org.eclipse.papyrus.moka.engine.suml.feature/feature.properties b/suml/features/org.eclipse.papyrus.moka.engine.suml.feature/feature.properties
similarity index 100%
rename from features/org.eclipse.papyrus.moka.engine.suml.feature/feature.properties
rename to suml/features/org.eclipse.papyrus.moka.engine.suml.feature/feature.properties
diff --git a/features/org.eclipse.papyrus.moka.engine.suml.feature/feature.xml b/suml/features/org.eclipse.papyrus.moka.engine.suml.feature/feature.xml
similarity index 100%
rename from features/org.eclipse.papyrus.moka.engine.suml.feature/feature.xml
rename to suml/features/org.eclipse.papyrus.moka.engine.suml.feature/feature.xml
diff --git a/features/org.eclipse.papyrus.moka.engine.suml.feature/pom.xml b/suml/features/org.eclipse.papyrus.moka.engine.suml.feature/pom.xml
similarity index 84%
rename from features/org.eclipse.papyrus.moka.engine.suml.feature/pom.xml
rename to suml/features/org.eclipse.papyrus.moka.engine.suml.feature/pom.xml
index 4ddad21..07064f2 100644
--- a/features/org.eclipse.papyrus.moka.engine.suml.feature/pom.xml
+++ b/suml/features/org.eclipse.papyrus.moka.engine.suml.feature/pom.xml
@@ -6,8 +6,8 @@
 	<!-- Parent POM (i.e., POM located in the feature folder) -->
 	<parent>
 		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.features.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.engine.suml</groupId>
+		<artifactId>org.eclipse.papyrus.moka.engine.suml.features</artifactId>
 	</parent>
 	
 	<!-- POM description -->
diff --git a/suml/features/pom.xml b/suml/features/pom.xml
new file mode 100644
index 0000000..976b4f2
--- /dev/null
+++ b/suml/features/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.engine.suml</groupId>
+		<artifactId>org.eclipse.papyrus.moka.engine.suml.root</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.engine.suml.features</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.moka.engine.suml.feature</module>
+	</modules>	
+	
+</project>
\ No newline at end of file
diff --git a/suml/pom.xml b/suml/pom.xml
new file mode 100644
index 0000000..cb774dd
--- /dev/null
+++ b/suml/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<artifactId>org.eclipse.papyrus.moka.incubation.root</artifactId>		
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<groupId>org.eclipse.papyrus.moka.engine.suml</groupId>
+	<artifactId>org.eclipse.papyrus.moka.engine.suml.root</artifactId>
+	<version>0.7.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	
+	<profiles>
+		<profile>
+			<id>suml</id>	
+			<properties>
+				<targetplatform.groupId>org.eclipse.papyrus.moka.engine.suml</targetplatform.groupId>
+				<targetplatform.artifactId>org.eclipse.papyrus.moka.engine.suml.targetplatform</targetplatform.artifactId>
+				<targetplatform.version>0.7.0-SNAPSHOT</targetplatform.version>
+			</properties>
+			
+			<modules>
+				<module>bundles</module>
+				<module>features</module>
+				<module>releng</module>
+			</modules>
+		</profile>
+	</profiles>
+	
+</project>
\ No newline at end of file
diff --git a/suml/releng/org.eclipse.papyrus.moka.engine.suml.p2/.project b/suml/releng/org.eclipse.papyrus.moka.engine.suml.p2/.project
new file mode 100644
index 0000000..0a79233
--- /dev/null
+++ b/suml/releng/org.eclipse.papyrus.moka.engine.suml.p2/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.incubation.p2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/suml/releng/org.eclipse.papyrus.moka.engine.suml.p2/category.xml b/suml/releng/org.eclipse.papyrus.moka.engine.suml.p2/category.xml
new file mode 100644
index 0000000..3bde7f4
--- /dev/null
+++ b/suml/releng/org.eclipse.papyrus.moka.engine.suml.p2/category.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+  <feature url="features/org.eclipse.papyrus.moka.engine.suml.feature_0.7.0.qualifier.jar" id="org.eclipse.papyrus.moka.engine.suml.feature" version="0.7.0.qualifier">
+      <category name="org.eclipse.papyrus.moka.incubation.category"/>
+   </feature>
+  
+  <category-def name="org.eclipse.papyrus.moka.incubation.category" label="Papyrus Moka Incubation">
+      <description>
+         Papyrus Moka Incubation features
+      </description>
+   </category-def>
+</site>
diff --git a/suml/releng/org.eclipse.papyrus.moka.engine.suml.p2/pom.xml b/suml/releng/org.eclipse.papyrus.moka.engine.suml.p2/pom.xml
new file mode 100644
index 0000000..720ef3e
--- /dev/null
+++ b/suml/releng/org.eclipse.papyrus.moka.engine.suml.p2/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.engine.suml</groupId>
+		<artifactId>org.eclipse.papyrus.moka.engine.suml.releng</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.engine.suml.p2</artifactId>
+	<packaging>eclipse-repository</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/suml/releng/pom.xml b/suml/releng/pom.xml
new file mode 100644
index 0000000..c763939
--- /dev/null
+++ b/suml/releng/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.engine.suml</groupId>
+		<artifactId>org.eclipse.papyrus.moka.engine.suml.root</artifactId>		
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.engine.suml.releng</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.moka.engine.suml.p2</module>
+		<module>targetplatform</module>
+	</modules>	
+	
+</project>
\ No newline at end of file
diff --git a/suml/releng/targetplatform/org.eclipse.papyrus.moka.engine.suml.targetplatform.target b/suml/releng/targetplatform/org.eclipse.papyrus.moka.engine.suml.targetplatform.target
new file mode 100644
index 0000000..8615644
--- /dev/null
+++ b/suml/releng/targetplatform/org.eclipse.papyrus.moka.engine.suml.targetplatform.target
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Moka incubation - SUML" sequenceNumber="1626437032">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+      <repository id="eclipse" location="http://download.eclipse.org/releases/2020-12"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.moka.feature.feature.group" version="0.0.0"/>
+      <repository id="moka" location="https://ci.eclipse.org/papyrus/view/Moka/job/papyrus-moka-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.moka.p2/target/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ease.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ease.lang.python.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ease.lang.javascript.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ease.lang.python.jython" version="0.0.0"/>
+      <unit id="org.eclipse.ease.modules.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ease.modules.modeling.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ease.ui.feature.feature.group" version="0.0.0"/>
+      <repository id="ease" location="https://download.eclipse.org/ease/integration/nightly/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ease.engine.jython.feature.feature.group" version="0.0.0"/>
+      <repository location="https://eclipse-ease-addons.github.io/org.eclipse.ease.engines.p2/latest"/>
+    </location>
+  </locations>
+</target>
diff --git a/suml/releng/targetplatform/org.eclipse.papyrus.moka.engine.suml.targetplatform.tpd b/suml/releng/targetplatform/org.eclipse.papyrus.moka.engine.suml.targetplatform.tpd
new file mode 100644
index 0000000..6277e59
--- /dev/null
+++ b/suml/releng/targetplatform/org.eclipse.papyrus.moka.engine.suml.targetplatform.tpd
@@ -0,0 +1,23 @@
+target "Moka incubation - SUML" with source requirements
+
+location "http://download.eclipse.org/releases/2020-12" eclipse {
+	org.eclipse.platform.feature.group lazy
+}
+
+location "https://ci.eclipse.org/papyrus/view/Moka/job/papyrus-moka-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.moka.p2/target/repository/" moka {
+	org.eclipse.papyrus.moka.feature.feature.group lazy
+}
+
+location "https://download.eclipse.org/ease/integration/nightly/" ease {
+	org.eclipse.ease.feature.feature.group lazy
+	org.eclipse.ease.lang.python.feature.source.feature.group lazy
+	org.eclipse.ease.lang.javascript.feature.feature.group lazy
+	org.eclipse.ease.lang.python.jython lazy
+    org.eclipse.ease.modules.feature.feature.group lazy
+    org.eclipse.ease.modules.modeling.feature.feature.group lazy
+	org.eclipse.ease.ui.feature.feature.group lazy
+}
+
+location "https://eclipse-ease-addons.github.io/org.eclipse.ease.engines.p2/latest" {
+	org.eclipse.ease.engine.jython.feature.feature.group lazy
+}
\ No newline at end of file
diff --git a/suml/releng/targetplatform/pom.xml b/suml/releng/targetplatform/pom.xml
new file mode 100644
index 0000000..ff5bdd4
--- /dev/null
+++ b/suml/releng/targetplatform/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.engine.suml</groupId>
+		<artifactId>org.eclipse.papyrus.moka.engine.suml.releng</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.engine.suml.targetplatform</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	
+</project>
\ No newline at end of file
diff --git a/visualization/.project b/visualization/.project
new file mode 100644
index 0000000..2696e30
--- /dev/null
+++ b/visualization/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>visualization</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/.classpath b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/.classpath
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/.classpath
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/.classpath
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/.gitignore b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/.gitignore
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/.gitignore
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/.gitignore
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/.project b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/.project
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/.project
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/.project
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/META-INF/MANIFEST.MF b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/META-INF/MANIFEST.MF
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/META-INF/MANIFEST.MF
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/about.html b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/about.html
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/about.html
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/about.html
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/build.properties b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/build.properties
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/build.properties
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/build.properties
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/icons/Export CSV-16x16.png b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/icons/Export CSV-16x16.png
similarity index 98%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/icons/Export CSV-16x16.png
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/icons/Export CSV-16x16.png
index dc88b85..332055a 100644
--- a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/icons/Export CSV-16x16.png
+++ b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/icons/Export CSV-16x16.png
Binary files differ
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/icons/Import CSV-16x16.png b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/icons/Import CSV-16x16.png
similarity index 98%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/icons/Import CSV-16x16.png
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/icons/Import CSV-16x16.png
index 6cf84c1..33f7aba 100644
--- a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/icons/Import CSV-16x16.png
+++ b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/icons/Import CSV-16x16.png
Binary files differ
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/plugin.xml b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/plugin.xml
similarity index 99%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/plugin.xml
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/plugin.xml
index b49e6ef..02883f0 100644
--- a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/plugin.xml
+++ b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/plugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
+<?eclipse version="3.4"?> 
 <plugin>
    <extension
          point="org.eclipse.papyrus.uml.extensionpoints.UMLProfile">
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/pom.xml b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/pom.xml
similarity index 79%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/pom.xml
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/pom.xml
index 80af240..fbce02a 100644
--- a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/pom.xml
+++ b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/pom.xml
@@ -4,8 +4,8 @@
 
 	<!-- Parent POM (Tools) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.visualization.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.visualization</groupId>
+		<artifactId>org.eclipse.papyrus.moka.visualization.bundles.root</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/DataVisualizationProfile.ctx b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/DataVisualizationProfile.ctx
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/DataVisualizationProfile.ctx
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/DataVisualizationProfile.ctx
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleBooleanSeries.xwt b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleBooleanSeries.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleBooleanSeries.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleBooleanSeries.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleDataSource.xwt b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleDataSource.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleDataSource.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleDataSource.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleDoubleSeries.xwt b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleDoubleSeries.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleDoubleSeries.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleDoubleSeries.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleIntegerSeries.xwt b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleIntegerSeries.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleIntegerSeries.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleIntegerSeries.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleStringSeries.xwt b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleStringSeries.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleStringSeries.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleStringSeries.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleValueSeries.xwt b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleValueSeries.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleValueSeries.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/MultipleValueSeries.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleBooleanSeries.xwt b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleBooleanSeries.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleBooleanSeries.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleBooleanSeries.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleDataSource.xwt b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleDataSource.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleDataSource.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleDataSource.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleDoubleSeries.xwt b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleDoubleSeries.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleDoubleSeries.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleDoubleSeries.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleIntegerSeries.xwt b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleIntegerSeries.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleIntegerSeries.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleIntegerSeries.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleStringSeries.xwt b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleStringSeries.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleStringSeries.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleStringSeries.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleValueSeries.xwt b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleValueSeries.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleValueSeries.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/properties/ui/SingleValueSeries.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/CreateXYGraphFromDataSourceCommand.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/CreateXYGraphFromDataSourceCommand.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/CreateXYGraphFromDataSourceCommand.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/CreateXYGraphFromDataSourceCommand.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/CreateXYGraphFromDataSourceHandler.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/CreateXYGraphFromDataSourceHandler.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/CreateXYGraphFromDataSourceHandler.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/CreateXYGraphFromDataSourceHandler.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/ExportCSVHandler.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/ExportCSVHandler.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/ExportCSVHandler.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/ExportCSVHandler.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/ImportCSVHandler.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/ImportCSVHandler.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/ImportCSVHandler.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/ImportCSVHandler.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataPort.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataPort.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataPort.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataPort.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataSeriesXYGraphCoordinator.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataSeriesXYGraphCoordinator.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataSeriesXYGraphCoordinator.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataSeriesXYGraphCoordinator.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataSourceVariableID.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataSourceVariableID.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataSourceVariableID.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataSourceVariableID.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataVisualizationService.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataVisualizationService.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataVisualizationService.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataVisualizationService.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableDataEntry.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableDataEntry.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableDataEntry.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableDataEntry.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableDataInformation.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableDataInformation.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableDataInformation.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableDataInformation.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntry.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntry.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntry.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntry.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntryFactory.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntryFactory.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntryFactory.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntryFactory.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntryTable.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntryTable.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntryTable.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntryTable.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableImpl.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableImpl.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableImpl.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableImpl.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/services/XYGraphPropertiesNotificationService.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/services/XYGraphPropertiesNotificationService.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/services/XYGraphPropertiesNotificationService.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/services/XYGraphPropertiesNotificationService.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/services/XYGraphResourceSetListener.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/services/XYGraphResourceSetListener.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/services/XYGraphResourceSetListener.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/services/XYGraphResourceSetListener.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/Activator.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/Activator.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/Activator.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/Activator.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/GraphBuilderHelper.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/GraphBuilderHelper.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/GraphBuilderHelper.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/GraphBuilderHelper.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/XYGraphFilteredLabelProvider.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/XYGraphFilteredLabelProvider.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/XYGraphFilteredLabelProvider.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/XYGraphFilteredLabelProvider.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/diagram/DataSeriesXYGraphPageFactory.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/diagram/DataSeriesXYGraphPageFactory.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/diagram/DataSeriesXYGraphPageFactory.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/diagram/DataSeriesXYGraphPageFactory.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/dialogs/ExportImportCSVDialog.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/dialogs/ExportImportCSVDialog.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/dialogs/ExportImportCSVDialog.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/dialogs/ExportImportCSVDialog.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/tester/DataSourcePropertyTester.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/tester/DataSourcePropertyTester.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/tester/DataSourcePropertyTester.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/tester/DataSourcePropertyTester.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/.classpath b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/.classpath
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/.classpath
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/.classpath
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/.gitignore b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/.gitignore
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/.gitignore
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/.gitignore
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/.project b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/.project
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/.project
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/.project
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/META-INF/MANIFEST.MF b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/META-INF/MANIFEST.MF
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/META-INF/MANIFEST.MF
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/about.html b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/about.html
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/about.html
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/about.html
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/build.properties b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/build.properties
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/build.properties
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/build.properties
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/icons/binary-icon.png b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/icons/binary-icon.png
similarity index 99%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/icons/binary-icon.png
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/icons/binary-icon.png
index 51b96b0..a05423c 100644
--- a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/icons/binary-icon.png
+++ b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/icons/binary-icon.png
Binary files differ
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/icons/datasource.png b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/icons/datasource.png
similarity index 99%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/icons/datasource.png
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/icons/datasource.png
index dd2637b..9e3b6c3 100644
--- a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/icons/datasource.png
+++ b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/icons/datasource.png
Binary files differ
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/plugin.properties b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/plugin.properties
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/plugin.properties
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/plugin.properties
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/plugin.xml b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/plugin.xml
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/plugin.xml
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/plugin.xml
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/pom.xml b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/pom.xml
similarity index 79%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/pom.xml
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/pom.xml
index abda1b4..d853532 100644
--- a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/pom.xml
+++ b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/pom.xml
@@ -4,8 +4,8 @@
 
 	<!-- Parent POM (Tools) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.visualization.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.visualization</groupId>
+		<artifactId>org.eclipse.papyrus.moka.visualization.bundles.root</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.ecore b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.ecore
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.ecore
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.ecore
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.profile.di b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.profile.di
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.profile.di
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.profile.di
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.profile.genmodel b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.profile.genmodel
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.profile.genmodel
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.profile.genmodel
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.profile.notation b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.profile.notation
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.profile.notation
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.profile.notation
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.profile.uml b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.profile.uml
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.profile.uml
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.profile.uml
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/profile/profile.ecore b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/profile/profile.ecore
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/profile/profile.ecore
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/profile/profile.ecore
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/BooleanSeries.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/BooleanSeries.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/BooleanSeries.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/BooleanSeries.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/DataSource.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/DataSource.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/DataSource.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/DataSource.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/DoubleSeries.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/DoubleSeries.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/DoubleSeries.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/DoubleSeries.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/IntegerSeries.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/IntegerSeries.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/IntegerSeries.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/IntegerSeries.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/StringSeries.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/StringSeries.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/StringSeries.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/StringSeries.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/ValueSeries.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/ValueSeries.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/ValueSeries.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/ValueSeries.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/VisualizationFactory.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/VisualizationFactory.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/VisualizationFactory.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/VisualizationFactory.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/VisualizationPackage.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/VisualizationPackage.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/VisualizationPackage.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/VisualizationPackage.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/BooleanSeriesImpl.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/BooleanSeriesImpl.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/BooleanSeriesImpl.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/BooleanSeriesImpl.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/DataSourceImpl.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/DataSourceImpl.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/DataSourceImpl.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/DataSourceImpl.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/DoubleSeriesImpl.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/DoubleSeriesImpl.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/DoubleSeriesImpl.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/DoubleSeriesImpl.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/IntegerSeriesImpl.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/IntegerSeriesImpl.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/IntegerSeriesImpl.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/IntegerSeriesImpl.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/StringSeriesImpl.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/StringSeriesImpl.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/StringSeriesImpl.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/StringSeriesImpl.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/ValueSeriesImpl.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/ValueSeriesImpl.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/ValueSeriesImpl.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/ValueSeriesImpl.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/VisualizationFactoryImpl.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/VisualizationFactoryImpl.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/VisualizationFactoryImpl.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/VisualizationFactoryImpl.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/VisualizationPackageImpl.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/VisualizationPackageImpl.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/VisualizationPackageImpl.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/VisualizationPackageImpl.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/util/VisualizationAdapterFactory.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/util/VisualizationAdapterFactory.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/util/VisualizationAdapterFactory.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/util/VisualizationAdapterFactory.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/util/VisualizationSwitch.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/util/VisualizationSwitch.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/util/VisualizationSwitch.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/util/VisualizationSwitch.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/Activator.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/Activator.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/Activator.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/Activator.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/csv/CSVResource.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/csv/CSVResource.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/csv/CSVResource.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/csv/CSVResource.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/csv/CSVResourceFactory.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/csv/CSVResourceFactory.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/csv/CSVResourceFactory.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/csv/CSVResourceFactory.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomBooleanSeries.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomBooleanSeries.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomBooleanSeries.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomBooleanSeries.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomDataSources.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomDataSources.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomDataSources.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomDataSources.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomDoubleSeries.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomDoubleSeries.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomDoubleSeries.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomDoubleSeries.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomIntegerSeries.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomIntegerSeries.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomIntegerSeries.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomIntegerSeries.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomStringSeries.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomStringSeries.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomStringSeries.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomStringSeries.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomVisualizationPackageFactory.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomVisualizationPackageFactory.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomVisualizationPackageFactory.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomVisualizationPackageFactory.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/util/VisualizationUtil.java b/visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/util/VisualizationUtil.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/util/VisualizationUtil.java
rename to visualization/bundles/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/util/VisualizationUtil.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/.classpath b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/.classpath
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/.classpath
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/.classpath
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/.gitignore b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/.gitignore
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/.gitignore
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/.gitignore
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/.project b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/.project
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/.project
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/.project
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/META-INF/MANIFEST.MF b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/META-INF/MANIFEST.MF
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/META-INF/MANIFEST.MF
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/about.html b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/about.html
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/about.html
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/about.html
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/build.properties b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/build.properties
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/build.properties
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/build.properties
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/icons/full/obj16/xygraph16.gif b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/icons/full/obj16/xygraph16.gif
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/icons/full/obj16/xygraph16.gif
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/icons/full/obj16/xygraph16.gif
Binary files differ
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/plugin.xml b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/plugin.xml
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/plugin.xml
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/plugin.xml
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/pom.xml b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/pom.xml
similarity index 78%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/pom.xml
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/pom.xml
index f3fd99d..8a7b7b4 100644
--- a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/pom.xml
+++ b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/pom.xml
@@ -4,8 +4,8 @@
 
 	<!-- Parent POM (Tools) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.visualization.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.visualization</groupId>
+		<artifactId>org.eclipse.papyrus.moka.visualization.bundles.root</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/Activator.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/Activator.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/Activator.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/Activator.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/adapter/XYGraphAdapterFactory.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/adapter/XYGraphAdapterFactory.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/adapter/XYGraphAdapterFactory.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/adapter/XYGraphAdapterFactory.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/model/XYGraphDescriptorModel.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/model/XYGraphDescriptorModel.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/model/XYGraphDescriptorModel.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/model/XYGraphDescriptorModel.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/AbstractXYGraphPageFactory.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/AbstractXYGraphPageFactory.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/AbstractXYGraphPageFactory.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/AbstractXYGraphPageFactory.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphEditorPart.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphEditorPart.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphEditorPart.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphEditorPart.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphEditorPartSelectionProvider.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphEditorPartSelectionProvider.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphEditorPartSelectionProvider.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphEditorPartSelectionProvider.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphLabelProvider.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphLabelProvider.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphLabelProvider.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphLabelProvider.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceAxisUpdateStrategy.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceAxisUpdateStrategy.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceAxisUpdateStrategy.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceAxisUpdateStrategy.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceBaseUpdateStrategy.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceBaseUpdateStrategy.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceBaseUpdateStrategy.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceBaseUpdateStrategy.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceTraceUpdateStrategy.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceTraceUpdateStrategy.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceTraceUpdateStrategy.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceTraceUpdateStrategy.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceWriteStrategyFactory.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceWriteStrategyFactory.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceWriteStrategyFactory.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceWriteStrategyFactory.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceXYGraphUpdateStrategy.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceXYGraphUpdateStrategy.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceXYGraphUpdateStrategy.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceXYGraphUpdateStrategy.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/.classpath b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/.classpath
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/.classpath
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/.classpath
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/.gitignore b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/.gitignore
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/.gitignore
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/.gitignore
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/.project b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/.project
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/.project
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/.project
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/META-INF/MANIFEST.MF b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/META-INF/MANIFEST.MF
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/META-INF/MANIFEST.MF
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/about.html b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/about.html
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/about.html
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/about.html
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/build.properties b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/build.properties
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/build.properties
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/build.properties
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/pom.xml b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/pom.xml
similarity index 79%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/pom.xml
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/pom.xml
index d437cb8..eb6680c 100644
--- a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/pom.xml
+++ b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/pom.xml
@@ -4,8 +4,8 @@
 
 	<!-- Parent POM (Tools) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.visualization.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.visualization</groupId>
+		<artifactId>org.eclipse.papyrus.moka.visualization.bundles.root</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/Activator.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/Activator.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/Activator.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/Activator.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/DefaultXYGraphBinder.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/DefaultXYGraphBinder.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/DefaultXYGraphBinder.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/DefaultXYGraphBinder.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/Variable.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/Variable.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/Variable.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/Variable.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphBinder.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphBinder.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphBinder.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphBinder.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphCoordinator.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphCoordinator.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphCoordinator.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphCoordinator.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphDataBinder.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphDataBinder.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphDataBinder.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphDataBinder.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphListener.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphListener.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphListener.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphListener.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphMappingHelper.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphMappingHelper.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphMappingHelper.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphMappingHelper.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphWidgetBinder.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphWidgetBinder.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphWidgetBinder.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphWidgetBinder.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/BaseAxisListener.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/BaseAxisListener.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/BaseAxisListener.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/BaseAxisListener.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/DataBatch.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/DataBatch.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/DataBatch.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/DataBatch.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LUT.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LUT.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LUT.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LUT.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LightDataProvider.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LightDataProvider.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LightDataProvider.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LightDataProvider.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LightDataSample.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LightDataSample.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LightDataSample.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LightDataSample.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/TraceDataBounds.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/TraceDataBounds.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/TraceDataBounds.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/TraceDataBounds.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/AxisBuildStrategy.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/AxisBuildStrategy.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/AxisBuildStrategy.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/AxisBuildStrategy.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/AxisUpdateStrategy.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/AxisUpdateStrategy.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/AxisUpdateStrategy.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/AxisUpdateStrategy.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/ModelWritingStrategyFactory.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/ModelWritingStrategyFactory.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/ModelWritingStrategyFactory.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/ModelWritingStrategyFactory.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/TraceBuildStrategy.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/TraceBuildStrategy.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/TraceBuildStrategy.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/TraceBuildStrategy.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/TraceUpdateStrategy.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/TraceUpdateStrategy.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/TraceUpdateStrategy.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/TraceUpdateStrategy.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/XYGraphBuildStrategy.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/XYGraphBuildStrategy.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/XYGraphBuildStrategy.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/XYGraphBuildStrategy.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/XYGraphUpdateStrategy.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/XYGraphUpdateStrategy.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/XYGraphUpdateStrategy.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/XYGraphUpdateStrategy.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultAxisBuildStrategy.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultAxisBuildStrategy.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultAxisBuildStrategy.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultAxisBuildStrategy.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultAxisUpdateStrategy.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultAxisUpdateStrategy.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultAxisUpdateStrategy.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultAxisUpdateStrategy.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultModelWritingStrategyFactory.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultModelWritingStrategyFactory.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultModelWritingStrategyFactory.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultModelWritingStrategyFactory.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultTraceBuildStrategy.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultTraceBuildStrategy.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultTraceBuildStrategy.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultTraceBuildStrategy.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultTraceUpdateStrategy.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultTraceUpdateStrategy.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultTraceUpdateStrategy.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultTraceUpdateStrategy.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultXYGraphBuildStrategy.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultXYGraphBuildStrategy.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultXYGraphBuildStrategy.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultXYGraphBuildStrategy.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultXYGraphUpdateStrategy.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultXYGraphUpdateStrategy.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultXYGraphUpdateStrategy.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultXYGraphUpdateStrategy.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/MouseWheelZoomer.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/MouseWheelZoomer.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/MouseWheelZoomer.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/MouseWheelZoomer.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/.classpath b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/.classpath
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/.classpath
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/.classpath
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/.gitignore b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/.gitignore
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/.gitignore
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/.gitignore
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/.project b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/.project
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/.project
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/.project
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/META-INF/MANIFEST.MF b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/META-INF/MANIFEST.MF
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/META-INF/MANIFEST.MF
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/about.html b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/about.html
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/about.html
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/about.html
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/build.properties b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/build.properties
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/build.properties
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/build.properties
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/model/XYGraph.ecore b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/model/XYGraph.ecore
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/model/XYGraph.ecore
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/model/XYGraph.ecore
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/model/XYGraph.genmodel b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/model/XYGraph.genmodel
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/model/XYGraph.genmodel
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/model/XYGraph.genmodel
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/plugin.properties b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/plugin.properties
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/plugin.properties
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/plugin.properties
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/plugin.xml b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/plugin.xml
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/plugin.xml
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/plugin.xml
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/pom.xml b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/pom.xml
similarity index 78%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/pom.xml
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/pom.xml
index 9016f54..01b6b9d 100644
--- a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/pom.xml
+++ b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/pom.xml
@@ -4,8 +4,8 @@
 
 	<!-- Parent POM (Tools) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.visualization.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.visualization</groupId>
+		<artifactId>org.eclipse.papyrus.moka.visualization.bundles.root</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/AxisDescriptor.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/AxisDescriptor.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/AxisDescriptor.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/AxisDescriptor.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/ColorDescriptor.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/ColorDescriptor.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/ColorDescriptor.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/ColorDescriptor.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/FontDescriptor.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/FontDescriptor.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/FontDescriptor.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/FontDescriptor.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/LinearScale_Orientation.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/LinearScale_Orientation.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/LinearScale_Orientation.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/LinearScale_Orientation.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/TraceDescriptor.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/TraceDescriptor.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/TraceDescriptor.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/TraceDescriptor.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_BaseLine.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_BaseLine.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_BaseLine.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_BaseLine.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_ErrorBarType.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_ErrorBarType.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_ErrorBarType.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_ErrorBarType.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_PointStyle.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_PointStyle.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_PointStyle.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_PointStyle.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_TraceType.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_TraceType.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_TraceType.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_TraceType.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphDescriptor.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphDescriptor.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphDescriptor.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphDescriptor.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphFactory.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphFactory.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphFactory.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphFactory.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphPackage.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphPackage.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphPackage.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphPackage.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/ZoomType.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/ZoomType.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/ZoomType.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/ZoomType.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/AxisDescriptorImpl.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/AxisDescriptorImpl.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/AxisDescriptorImpl.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/AxisDescriptorImpl.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/ColorDescriptorImpl.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/ColorDescriptorImpl.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/ColorDescriptorImpl.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/ColorDescriptorImpl.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/FontDescriptorImpl.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/FontDescriptorImpl.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/FontDescriptorImpl.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/FontDescriptorImpl.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/TraceDescriptorImpl.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/TraceDescriptorImpl.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/TraceDescriptorImpl.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/TraceDescriptorImpl.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphDescriptorImpl.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphDescriptorImpl.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphDescriptorImpl.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphDescriptorImpl.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphFactoryImpl.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphFactoryImpl.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphFactoryImpl.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphFactoryImpl.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphPackageImpl.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphPackageImpl.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphPackageImpl.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphPackageImpl.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/util/XYGraphAdapterFactory.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/util/XYGraphAdapterFactory.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/util/XYGraphAdapterFactory.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/util/XYGraphAdapterFactory.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/util/XYGraphSwitch.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/util/XYGraphSwitch.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/util/XYGraphSwitch.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/util/XYGraphSwitch.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/Activator.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/Activator.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/Activator.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/Activator.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/AxisStructuralFeature.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/AxisStructuralFeature.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/AxisStructuralFeature.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/AxisStructuralFeature.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/TraceStructuralFeature.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/TraceStructuralFeature.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/TraceStructuralFeature.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/TraceStructuralFeature.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/XYGraphStructuralFeature.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/XYGraphStructuralFeature.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/XYGraphStructuralFeature.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/XYGraphStructuralFeature.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/.classpath b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/.classpath
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/.classpath
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/.classpath
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/.gitignore b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/.gitignore
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/.gitignore
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/.gitignore
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/.project b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/.project
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/.project
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/.project
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/META-INF/MANIFEST.MF b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/META-INF/MANIFEST.MF
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/META-INF/MANIFEST.MF
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/about.html b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/about.html
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/about.html
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/about.html
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/build.properties b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/build.properties
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/build.properties
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/build.properties
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/icons/full/obj16/xygraph16.gif b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/icons/full/obj16/xygraph16.gif
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/icons/full/obj16/xygraph16.gif
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/icons/full/obj16/xygraph16.gif
Binary files differ
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/plugin.xml b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/plugin.xml
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/plugin.xml
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/plugin.xml
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/pom.xml b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/pom.xml
similarity index 79%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/pom.xml
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/pom.xml
index 5be2a5f..7138b4a 100644
--- a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/pom.xml
+++ b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/pom.xml
@@ -4,8 +4,8 @@
 
 	<!-- Parent POM (Tools) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.visualization.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.visualization</groupId>
+		<artifactId>org.eclipse.papyrus.moka.visualization.bundles.root</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/resources/PapyrusXYGraph.custom b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/resources/PapyrusXYGraph.custom
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/resources/PapyrusXYGraph.custom
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/resources/PapyrusXYGraph.custom
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/Activator.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/Activator.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/Activator.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/Activator.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/EmptyListQuery.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/EmptyListQuery.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/EmptyListQuery.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/EmptyListQuery.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/GetContainedXYGraphs.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/GetContainedXYGraphs.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/GetContainedXYGraphs.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/GetContainedXYGraphs.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/GetXYGraphIcon.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/GetXYGraphIcon.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/GetXYGraphIcon.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/GetXYGraphIcon.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/IsXYGraphContainer.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/IsXYGraphContainer.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/IsXYGraphContainer.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/IsXYGraphContainer.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/.classpath b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/.classpath
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/.classpath
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/.classpath
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/.gitignore b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/.gitignore
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/.gitignore
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/.gitignore
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/.project b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/.project
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/.project
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/.project
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/META-INF/MANIFEST.MF b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/META-INF/MANIFEST.MF
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/META-INF/MANIFEST.MF
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/about.html b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/about.html
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/about.html
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/about.html
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/build.properties b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/build.properties
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/build.properties
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/build.properties
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/plugin.xml b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/plugin.xml
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/plugin.xml
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/plugin.xml
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/pom.xml b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/pom.xml
similarity index 79%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/pom.xml
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/pom.xml
index ceb51ad..86ed4ec 100644
--- a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/pom.xml
+++ b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/pom.xml
@@ -4,8 +4,8 @@
 
 	<!-- Parent POM (Tools) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.visualization.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.visualization</groupId>
+		<artifactId>org.eclipse.papyrus.moka.visualization.bundles.root</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/XYGraph.ctx b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/XYGraph.ctx
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/XYGraph.ctx
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/XYGraph.ctx
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/MultipleAxisDescriptor.xwt b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/MultipleAxisDescriptor.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/MultipleAxisDescriptor.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/MultipleAxisDescriptor.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/MultipleColorDescriptor.xwt b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/MultipleColorDescriptor.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/MultipleColorDescriptor.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/MultipleColorDescriptor.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/MultipleFontDescriptor.xwt b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/MultipleFontDescriptor.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/MultipleFontDescriptor.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/MultipleFontDescriptor.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/MultipleTraceDescriptor.xwt b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/MultipleTraceDescriptor.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/MultipleTraceDescriptor.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/MultipleTraceDescriptor.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/MultipleXYGraphDescriptor.xwt b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/MultipleXYGraphDescriptor.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/MultipleXYGraphDescriptor.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/MultipleXYGraphDescriptor.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/SingleAxisDescriptor.xwt b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/SingleAxisDescriptor.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/SingleAxisDescriptor.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/SingleAxisDescriptor.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/SingleColorDescriptor.xwt b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/SingleColorDescriptor.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/SingleColorDescriptor.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/SingleColorDescriptor.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/SingleFontDescriptor.xwt b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/SingleFontDescriptor.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/SingleFontDescriptor.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/SingleFontDescriptor.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/SingleTraceDescriptor.xwt b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/SingleTraceDescriptor.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/SingleTraceDescriptor.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/SingleTraceDescriptor.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/SingleXYGraphDescriptor.xwt b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/SingleXYGraphDescriptor.xwt
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/SingleXYGraphDescriptor.xwt
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/ui/SingleXYGraphDescriptor.xwt
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/xygraph.environment b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/xygraph.environment
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/properties/xygraph.environment
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/properties/xygraph.environment
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/Activator.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/Activator.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/Activator.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/Activator.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/constraints/IsXYGraphConstraint.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/constraints/IsXYGraphConstraint.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/constraints/IsXYGraphConstraint.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/constraints/IsXYGraphConstraint.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/VisibleTracesContentProvider.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/VisibleTracesContentProvider.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/VisibleTracesContentProvider.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/VisibleTracesContentProvider.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/XYGraphModelElement.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/XYGraphModelElement.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/XYGraphModelElement.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/XYGraphModelElement.java
diff --git a/bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/XYGraphModelElementFactory.java b/visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/XYGraphModelElementFactory.java
similarity index 100%
rename from bundles/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/XYGraphModelElementFactory.java
rename to visualization/bundles/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/XYGraphModelElementFactory.java
diff --git a/bundles/visualization/pom.xml b/visualization/bundles/pom.xml
similarity index 81%
rename from bundles/visualization/pom.xml
rename to visualization/bundles/pom.xml
index e0bc46e..be89b44 100644
--- a/bundles/visualization/pom.xml
+++ b/visualization/bundles/pom.xml
@@ -8,12 +8,12 @@
 	<!-- Parent POM (i.e., Core) -->
 	<parent>
 		<version>0.7.0-SNAPSHOT</version>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.bundles.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.visualization</groupId>
+		<artifactId>org.eclipse.papyrus.moka.visualization.root</artifactId>
 	</parent>
 	
 	<!-- POM Description -->
-	<artifactId>org.eclipse.papyrus.moka.incubation.visualization.root</artifactId>
+	<artifactId>org.eclipse.papyrus.moka.visualization.bundles.root</artifactId>
 	<name>Moka Data Visualization Tool</name>
 	<packaging>pom</packaging>
 	
diff --git a/features/org.eclipse.papyrus.moka.visualization.feature/.project b/visualization/features/org.eclipse.papyrus.moka.visualization.feature/.project
similarity index 100%
rename from features/org.eclipse.papyrus.moka.visualization.feature/.project
rename to visualization/features/org.eclipse.papyrus.moka.visualization.feature/.project
diff --git a/features/org.eclipse.papyrus.moka.visualization.feature/about.html b/visualization/features/org.eclipse.papyrus.moka.visualization.feature/about.html
similarity index 100%
rename from features/org.eclipse.papyrus.moka.visualization.feature/about.html
rename to visualization/features/org.eclipse.papyrus.moka.visualization.feature/about.html
diff --git a/features/org.eclipse.papyrus.moka.visualization.feature/build.properties b/visualization/features/org.eclipse.papyrus.moka.visualization.feature/build.properties
similarity index 100%
rename from features/org.eclipse.papyrus.moka.visualization.feature/build.properties
rename to visualization/features/org.eclipse.papyrus.moka.visualization.feature/build.properties
diff --git a/features/org.eclipse.papyrus.moka.visualization.feature/feature.properties b/visualization/features/org.eclipse.papyrus.moka.visualization.feature/feature.properties
similarity index 100%
rename from features/org.eclipse.papyrus.moka.visualization.feature/feature.properties
rename to visualization/features/org.eclipse.papyrus.moka.visualization.feature/feature.properties
diff --git a/features/org.eclipse.papyrus.moka.visualization.feature/feature.xml b/visualization/features/org.eclipse.papyrus.moka.visualization.feature/feature.xml
similarity index 100%
rename from features/org.eclipse.papyrus.moka.visualization.feature/feature.xml
rename to visualization/features/org.eclipse.papyrus.moka.visualization.feature/feature.xml
diff --git a/features/org.eclipse.papyrus.moka.visualization.feature/pom.xml b/visualization/features/org.eclipse.papyrus.moka.visualization.feature/pom.xml
similarity index 80%
rename from features/org.eclipse.papyrus.moka.visualization.feature/pom.xml
rename to visualization/features/org.eclipse.papyrus.moka.visualization.feature/pom.xml
index 5adfa3f..1ff87be 100644
--- a/features/org.eclipse.papyrus.moka.visualization.feature/pom.xml
+++ b/visualization/features/org.eclipse.papyrus.moka.visualization.feature/pom.xml
@@ -3,8 +3,8 @@
 	
 	<!-- Parent POM (i.e., POM located in the feature folder) -->
 	<parent>
-		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
-		<artifactId>org.eclipse.papyrus.moka.incubation.features.root</artifactId>
+		<groupId>org.eclipse.papyrus.moka.visualization</groupId>
+		<artifactId>org.eclipse.papyrus.moka.visualization.features</artifactId>
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 	
diff --git a/visualization/features/pom.xml b/visualization/features/pom.xml
new file mode 100644
index 0000000..297028f
--- /dev/null
+++ b/visualization/features/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.visualization</groupId>
+		<artifactId>org.eclipse.papyrus.moka.visualization.root</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.visualization.features</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.moka.visualization.feature</module>
+	</modules>	
+	
+</project>
\ No newline at end of file
diff --git a/visualization/pom.xml b/visualization/pom.xml
new file mode 100644
index 0000000..c52a08f
--- /dev/null
+++ b/visualization/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.incubation</groupId>
+		<artifactId>org.eclipse.papyrus.moka.incubation.root</artifactId>		
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<groupId>org.eclipse.papyrus.moka.visualization</groupId>
+	<artifactId>org.eclipse.papyrus.moka.visualization.root</artifactId>
+	<version>0.7.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	
+	<profiles>
+		<profile>
+			<id>visualization</id>	
+			<properties>
+				<targetplatform.groupId>org.eclipse.papyrus.moka.visualization</targetplatform.groupId>
+				<targetplatform.artifactId>org.eclipse.papyrus.moka.visualization.targetplatform</targetplatform.artifactId>
+				<targetplatform.version>0.7.0-SNAPSHOT</targetplatform.version>
+			</properties>
+			
+			<modules>
+				<module>bundles</module>
+				<module>features</module>
+				<module>releng</module>
+			</modules>
+		</profile>
+	</profiles>
+	
+</project>
\ No newline at end of file
diff --git a/visualization/releng/org.eclipse.papyrus.moka.visualization.p2/.project b/visualization/releng/org.eclipse.papyrus.moka.visualization.p2/.project
new file mode 100644
index 0000000..0a79233
--- /dev/null
+++ b/visualization/releng/org.eclipse.papyrus.moka.visualization.p2/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.incubation.p2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/visualization/releng/org.eclipse.papyrus.moka.visualization.p2/category.xml b/visualization/releng/org.eclipse.papyrus.moka.visualization.p2/category.xml
new file mode 100644
index 0000000..e56fd57
--- /dev/null
+++ b/visualization/releng/org.eclipse.papyrus.moka.visualization.p2/category.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+  <feature url="features/org.eclipse.papyrus.moka.visualization.feature_0.7.0.qualifier.jar" id="org.eclipse.papyrus.moka.visualization.feature" version="0.7.0.qualifier">
+      <category name="org.eclipse.papyrus.moka.incubation.category"/>
+   </feature>
+  
+  <category-def name="org.eclipse.papyrus.moka.incubation.category" label="Papyrus Moka Incubation">
+      <description>
+         Papyrus Moka Incubation features
+      </description>
+   </category-def>
+</site>
diff --git a/visualization/releng/org.eclipse.papyrus.moka.visualization.p2/pom.xml b/visualization/releng/org.eclipse.papyrus.moka.visualization.p2/pom.xml
new file mode 100644
index 0000000..d4b7283
--- /dev/null
+++ b/visualization/releng/org.eclipse.papyrus.moka.visualization.p2/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.visualization</groupId>
+		<artifactId>org.eclipse.papyrus.moka.visualization.releng</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.visualization.p2</artifactId>
+	<packaging>eclipse-repository</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/visualization/releng/pom.xml b/visualization/releng/pom.xml
new file mode 100644
index 0000000..e6c7cc6
--- /dev/null
+++ b/visualization/releng/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.visualization</groupId>
+		<artifactId>org.eclipse.papyrus.moka.visualization.root</artifactId>		
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.visualization.releng</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.moka.visualization.p2</module>
+		<module>targetplatform</module>
+	</modules>	
+	
+</project>
\ No newline at end of file
diff --git a/visualization/releng/targetplatform/org.eclipse.papyrus.moka.visualization.targetplatform.target b/visualization/releng/targetplatform/org.eclipse.papyrus.moka.visualization.targetplatform.target
new file mode 100644
index 0000000..bde1e24
--- /dev/null
+++ b/visualization/releng/targetplatform/org.eclipse.papyrus.moka.visualization.targetplatform.target
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Moka incubation - Visualization" sequenceNumber="1626437110">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse" location="http://download.eclipse.org/releases/2020-12"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.moka.feature.feature.group" version="0.0.0"/>
+      <repository id="moka" location="https://ci.eclipse.org/papyrus/view/Moka/job/papyrus-moka-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.moka.p2/target/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.nebula.visualization.feature.feature.group" version="0.0.0"/>
+      <repository id="nebula" location="http://download.eclipse.org/nebula/releases/2.0.1"/>
+    </location>
+  </locations>
+</target>
diff --git a/visualization/releng/targetplatform/org.eclipse.papyrus.moka.visualization.targetplatform.tpd b/visualization/releng/targetplatform/org.eclipse.papyrus.moka.visualization.targetplatform.tpd
new file mode 100644
index 0000000..0902232
--- /dev/null
+++ b/visualization/releng/targetplatform/org.eclipse.papyrus.moka.visualization.targetplatform.tpd
@@ -0,0 +1,15 @@
+target "Moka incubation - Visualization" with source requirements
+
+location "http://download.eclipse.org/releases/2020-12" eclipse {
+	org.eclipse.platform.feature.group lazy
+	org.eclipse.papyrus.sdk.feature.feature.group lazy
+}
+
+location "https://ci.eclipse.org/papyrus/view/Moka/job/papyrus-moka-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.moka.p2/target/repository/" moka {
+	org.eclipse.papyrus.moka.feature.feature.group lazy
+}
+
+location "http://download.eclipse.org/nebula/releases/2.0.1" nebula {
+	org.eclipse.nebula.widgets.xviewer.feature.feature.group lazy
+	org.eclipse.nebula.visualization.feature.feature.group lazy
+}
\ No newline at end of file
diff --git a/visualization/releng/targetplatform/pom.xml b/visualization/releng/targetplatform/pom.xml
new file mode 100644
index 0000000..effabe6
--- /dev/null
+++ b/visualization/releng/targetplatform/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.moka.visualization</groupId>
+		<artifactId>org.eclipse.papyrus.moka.visualization.releng</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.moka.visualization.targetplatform</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	
+</project>
\ No newline at end of file