commit a0937bcaf308c1fa8f4c10078d38ead34ad2a940
author Quentin Le Menez <quentin.lemenez@cea.fr> Tue Aug 29 16:43:24 2017 +0200
committer Quentin Le Menez <quentin.lemenez@cea.fr> Fri Sep 01 15:37:05 2017 +0200
tree 4846178fb14486481ee39c5d591b841cacc0d009
parent 871e5c093b5dbca725199c4ac4dca6814d2f3803

[releng] [oxygen] Update the repository architecture

- respect the conventions
- add releng possibilities so that all the incubation projects can be available following the next oxygen.1 release
- update each script for future jobs/plublish
- update root pom to go through the tests if there are failures instead of failing the build

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

.project

diff --git a/alf/org.eclipse.papyrus.uml.alf.extra.feature/.project b/.project
similarity index 61%
rename from alf/org.eclipse.papyrus.uml.alf.extra.feature/.project
rename to .project
index 5757288..a7f91c7 100755
--- a/alf/org.eclipse.papyrus.uml.alf.extra.feature/.project
+++ b/.project
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.uml.alf.extra.feature</name>
+	<name>Papyrus-Incubation</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>

alf/core/org.eclipse.papyrus.uml.alf.text/pom.xml

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/pom.xml b/alf/core/org.eclipse.papyrus.uml.alf.text/pom.xml
deleted file mode 100755
index a1484bd..0000000
--- a/alf/core/org.eclipse.papyrus.uml.alf.text/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.alf.core</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.alf.text</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

alf/core/org.eclipse.papyrus.uml.alf.transaction/pom.xml

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/pom.xml b/alf/core/org.eclipse.papyrus.uml.alf.transaction/pom.xml
deleted file mode 100755
index 3dc214a..0000000
--- a/alf/core/org.eclipse.papyrus.uml.alf.transaction/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.alf.core</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.alf.transaction</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

alf/core/pom.xml

diff --git a/alf/core/pom.xml b/alf/core/pom.xml
deleted file mode 100755
index deb396b..0000000
--- a/alf/core/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.alf.parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.alf.core</artifactId>
-	<packaging>pom</packaging>
-	
-	<modules>
-		<module>org.eclipse.papyrus.uml.alf.text</module>
-		<module>org.eclipse.papyrus.uml.alf.transaction</module>
-	</modules>	
-	
-</project>
\ No newline at end of file

alf/features/org.eclipse.papyrus.alf.sdk.feature/.project

diff --git a/alf/org.eclipse.papyrus.alf.sdk-feature/.project b/alf/features/org.eclipse.papyrus.alf.sdk.feature/.project
similarity index 100%
rename from alf/org.eclipse.papyrus.alf.sdk-feature/.project
rename to alf/features/org.eclipse.papyrus.alf.sdk.feature/.project

alf/features/org.eclipse.papyrus.alf.sdk.feature/about.html

diff --git a/alf/org.eclipse.papyrus.alf.sdk-feature/about.html b/alf/features/org.eclipse.papyrus.alf.sdk.feature/about.html
similarity index 100%
rename from alf/org.eclipse.papyrus.alf.sdk-feature/about.html
rename to alf/features/org.eclipse.papyrus.alf.sdk.feature/about.html

alf/features/org.eclipse.papyrus.alf.sdk.feature/build.properties

diff --git a/alf/org.eclipse.papyrus.alf.sdk-feature/build.properties b/alf/features/org.eclipse.papyrus.alf.sdk.feature/build.properties
similarity index 100%
rename from alf/org.eclipse.papyrus.alf.sdk-feature/build.properties
rename to alf/features/org.eclipse.papyrus.alf.sdk.feature/build.properties

alf/features/org.eclipse.papyrus.alf.sdk.feature/eclipse_update_120.jpg

diff --git a/alf/org.eclipse.papyrus.alf.sdk-feature/eclipse_update_120.jpg b/alf/features/org.eclipse.papyrus.alf.sdk.feature/eclipse_update_120.jpg
similarity index 100%
rename from alf/org.eclipse.papyrus.alf.sdk-feature/eclipse_update_120.jpg
rename to alf/features/org.eclipse.papyrus.alf.sdk.feature/eclipse_update_120.jpg
Binary files differ

alf/features/org.eclipse.papyrus.alf.sdk.feature/epl-v10.html

diff --git a/alf/org.eclipse.papyrus.alf.sdk-feature/epl-v10.html b/alf/features/org.eclipse.papyrus.alf.sdk.feature/epl-v10.html
similarity index 100%
rename from alf/org.eclipse.papyrus.alf.sdk-feature/epl-v10.html
rename to alf/features/org.eclipse.papyrus.alf.sdk.feature/epl-v10.html

alf/features/org.eclipse.papyrus.alf.sdk.feature/feature.properties

diff --git a/alf/org.eclipse.papyrus.alf.sdk-feature/feature.properties b/alf/features/org.eclipse.papyrus.alf.sdk.feature/feature.properties
similarity index 100%
rename from alf/org.eclipse.papyrus.alf.sdk-feature/feature.properties
rename to alf/features/org.eclipse.papyrus.alf.sdk.feature/feature.properties

alf/features/org.eclipse.papyrus.alf.sdk.feature/feature.xml

diff --git a/alf/org.eclipse.papyrus.alf.sdk-feature/feature.xml b/alf/features/org.eclipse.papyrus.alf.sdk.feature/feature.xml
similarity index 100%
rename from alf/org.eclipse.papyrus.alf.sdk-feature/feature.xml
rename to alf/features/org.eclipse.papyrus.alf.sdk.feature/feature.xml

alf/features/org.eclipse.papyrus.alf.sdk.feature/license.html

diff --git a/alf/org.eclipse.papyrus.alf.sdk-feature/license.html b/alf/features/org.eclipse.papyrus.alf.sdk.feature/license.html
similarity index 100%
rename from alf/org.eclipse.papyrus.alf.sdk-feature/license.html
rename to alf/features/org.eclipse.papyrus.alf.sdk.feature/license.html

alf/features/org.eclipse.papyrus.alf.sdk.feature/pom.xml

diff --git a/alf/features/org.eclipse.papyrus.alf.sdk.feature/pom.xml b/alf/features/org.eclipse.papyrus.alf.sdk.feature/pom.xml
new file mode 100755
index 0000000..cc2015f
--- /dev/null
+++ b/alf/features/org.eclipse.papyrus.alf.sdk.feature/pom.xml
@@ -0,0 +1,14 @@
+<?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.incubation.alf</groupId>
+		<artifactId>org.eclipse.papyrus.alf.features</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.uml.alf.sdk.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file

alf/features/org.eclipse.papyrus.uml.alf.integration.feature/.project

diff --git a/alf/org.eclipse.papyrus.uml.alf.integration.feature/.project b/alf/features/org.eclipse.papyrus.uml.alf.integration.feature/.project
similarity index 100%
rename from alf/org.eclipse.papyrus.uml.alf.integration.feature/.project
rename to alf/features/org.eclipse.papyrus.uml.alf.integration.feature/.project

alf/features/org.eclipse.papyrus.uml.alf.integration.feature/build.properties

diff --git a/alf/org.eclipse.papyrus.uml.alf.integration.feature/build.properties b/alf/features/org.eclipse.papyrus.uml.alf.integration.feature/build.properties
similarity index 100%
rename from alf/org.eclipse.papyrus.uml.alf.integration.feature/build.properties
rename to alf/features/org.eclipse.papyrus.uml.alf.integration.feature/build.properties

alf/features/org.eclipse.papyrus.uml.alf.integration.feature/epl-v10.html

diff --git a/alf/org.eclipse.papyrus.uml.alf.integration.feature/epl-v10.html b/alf/features/org.eclipse.papyrus.uml.alf.integration.feature/epl-v10.html
similarity index 100%
rename from alf/org.eclipse.papyrus.uml.alf.integration.feature/epl-v10.html
rename to alf/features/org.eclipse.papyrus.uml.alf.integration.feature/epl-v10.html

alf/features/org.eclipse.papyrus.uml.alf.integration.feature/feature.properties

diff --git a/alf/org.eclipse.papyrus.uml.alf.integration.feature/feature.properties b/alf/features/org.eclipse.papyrus.uml.alf.integration.feature/feature.properties
similarity index 100%
rename from alf/org.eclipse.papyrus.uml.alf.integration.feature/feature.properties
rename to alf/features/org.eclipse.papyrus.uml.alf.integration.feature/feature.properties

alf/features/org.eclipse.papyrus.uml.alf.integration.feature/feature.xml

diff --git a/alf/org.eclipse.papyrus.uml.alf.integration.feature/feature.xml b/alf/features/org.eclipse.papyrus.uml.alf.integration.feature/feature.xml
similarity index 100%
rename from alf/org.eclipse.papyrus.uml.alf.integration.feature/feature.xml
rename to alf/features/org.eclipse.papyrus.uml.alf.integration.feature/feature.xml

alf/features/org.eclipse.papyrus.uml.alf.integration.feature/license.html

diff --git a/alf/org.eclipse.papyrus.uml.alf.integration.feature/license.html b/alf/features/org.eclipse.papyrus.uml.alf.integration.feature/license.html
similarity index 100%
rename from alf/org.eclipse.papyrus.uml.alf.integration.feature/license.html
rename to alf/features/org.eclipse.papyrus.uml.alf.integration.feature/license.html

alf/features/org.eclipse.papyrus.uml.alf.integration.feature/pom.xml

diff --git a/alf/features/org.eclipse.papyrus.uml.alf.integration.feature/pom.xml b/alf/features/org.eclipse.papyrus.uml.alf.integration.feature/pom.xml
new file mode 100644
index 0000000..6be5fdb
--- /dev/null
+++ b/alf/features/org.eclipse.papyrus.uml.alf.integration.feature/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.incubation.alf</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.alf.features</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<version>0.7.0-SNAPSHOT</version>
+	<artifactId>org.eclipse.papyrus.uml.alf.integration.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file

alf/features/pom.xml

diff --git a/alf/features/pom.xml b/alf/features/pom.xml
new file mode 100755
index 0000000..03c7e66
--- /dev/null
+++ b/alf/features/pom.xml
@@ -0,0 +1,22 @@
+<?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.incubation.alf</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.alf.parent</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.alf.features</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.uml.alf.integration.feature</module>
+		
+		<!-- FIXME: was present in Papyrus core repositoy but unused in the build
+		<module>org.eclipse.papyrus.alf.sdk.feature</module> -->
+	</modules>	
+	
+</project>
\ No newline at end of file

alf/org.eclipse.papyrus.operation.editor.xtext.ui/pom.xml

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/pom.xml b/alf/org.eclipse.papyrus.operation.editor.xtext.ui/pom.xml
deleted file mode 100755
index 96d0e6b..0000000
--- a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.alf.parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.operation.editor.xtext.ui</artifactId>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

alf/org.eclipse.papyrus.operation.editor.xtext/pom.xml

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/pom.xml b/alf/org.eclipse.papyrus.operation.editor.xtext/pom.xml
deleted file mode 100755
index df4e7a4..0000000
--- a/alf/org.eclipse.papyrus.operation.editor.xtext/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.alf.parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.operation.editor.xtext</artifactId>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

alf/org.eclipse.papyrus.uml.alf.integration.feature/pom.xml

diff --git a/alf/org.eclipse.papyrus.uml.alf.integration.feature/pom.xml b/alf/org.eclipse.papyrus.uml.alf.integration.feature/pom.xml
deleted file mode 100644
index d84ec96..0000000
--- a/alf/org.eclipse.papyrus.uml.alf.integration.feature/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.alf.parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.alf.integration.feature</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
\ No newline at end of file

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/.classpath

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/.classpath b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/.classpath
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/.classpath
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/.classpath

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/.project

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/.project b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/.project
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/.project
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/.project

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/.settings/org.eclipse.jdt.core.prefs

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/.settings/org.eclipse.jdt.core.prefs b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/.settings/org.eclipse.jdt.core.prefs
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/.settings/org.eclipse.jdt.core.prefs

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/.settings/org.eclipse.jdt.ui.prefs

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/.settings/org.eclipse.jdt.ui.prefs b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/.settings/org.eclipse.jdt.ui.prefs
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/.settings/org.eclipse.jdt.ui.prefs

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/META-INF/MANIFEST.MF

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/META-INF/MANIFEST.MF b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/META-INF/MANIFEST.MF
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/META-INF/MANIFEST.MF
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/META-INF/MANIFEST.MF

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/about.html

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/about.html b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/about.html
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/about.html
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/about.html

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/build.properties

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/build.properties b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/build.properties
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/build.properties
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/build.properties

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/pom.xml

diff --git a/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/pom.xml b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/pom.xml
new file mode 100755
index 0000000..940eefe
--- /dev/null
+++ b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/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.incubation.alf</groupId>
+		<artifactId>org.eclipse.papyrus.alf.core</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.uml.alf.text</artifactId>
+	<version>0.7.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/ActivatorText.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/ActivatorText.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/ActivatorText.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/ActivatorText.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/ActivatorText.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/generation/DefaultEditStringRetrievalStrategy.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/generation/DefaultEditStringRetrievalStrategy.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/generation/DefaultEditStringRetrievalStrategy.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/generation/DefaultEditStringRetrievalStrategy.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/generation/DefaultEditStringRetrievalStrategy.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/generation/EditStringRetrievalStrategy.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/generation/EditStringRetrievalStrategy.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/generation/EditStringRetrievalStrategy.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/generation/EditStringRetrievalStrategy.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/generation/EditStringRetrievalStrategy.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/merge/manual/AlfCompareEditor.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/merge/manual/AlfCompareEditor.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/merge/manual/AlfCompareEditor.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/merge/manual/AlfCompareEditor.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/merge/manual/AlfCompareEditor.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/merge/manual/MergeActionDialog.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/merge/manual/MergeActionDialog.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/merge/manual/MergeActionDialog.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/merge/manual/MergeActionDialog.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/merge/manual/MergeActionDialog.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/AlfTextualRepresentation.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/AlfTextualRepresentation.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/AlfTextualRepresentation.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/AlfTextualRepresentation.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/AlfTextualRepresentation.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/IAlfTextualRepresentation.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/IAlfTextualRepresentation.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/IAlfTextualRepresentation.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/IAlfTextualRepresentation.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/IAlfTextualRepresentation.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/TextualRepresentation.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/TextualRepresentation.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/TextualRepresentation.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/TextualRepresentation.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/TextualRepresentation.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/IAdvancedDifference.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/IAdvancedDifference.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/IAdvancedDifference.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/IAdvancedDifference.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/IAdvancedDifference.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/LineComparator.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/LineComparator.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/LineComparator.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/LineComparator.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/LineComparator.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/LineDifference.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/LineDifference.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/LineDifference.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/LineDifference.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/LineDifference.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/RegionDifference.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/RegionDifference.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/RegionDifference.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/RegionDifference.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/RegionDifference.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/StringUtil.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/StringUtil.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/StringUtil.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/StringUtil.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/StringUtil.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/TokenDifference.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/TokenDifference.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/TokenDifference.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/TokenDifference.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/TokenDifference.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/util/RepresentationParser.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/util/RepresentationParser.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/util/RepresentationParser.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/util/RepresentationParser.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/util/RepresentationParser.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/util/RepresentationParsingError.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/util/RepresentationParsingError.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/util/RepresentationParsingError.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/util/RepresentationParsingError.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/util/RepresentationParsingError.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/.classpath

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/.classpath b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/.classpath
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/.classpath
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/.classpath

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/.project

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/.project b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/.project
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/.project
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/.project

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/.settings/org.eclipse.jdt.core.prefs

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/.settings/org.eclipse.jdt.core.prefs b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/.settings/org.eclipse.jdt.core.prefs
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/.settings/org.eclipse.jdt.core.prefs

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/.settings/org.eclipse.jdt.ui.prefs

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/.settings/org.eclipse.jdt.ui.prefs b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/.settings/org.eclipse.jdt.ui.prefs
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/.settings/org.eclipse.jdt.ui.prefs

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/META-INF/MANIFEST.MF

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/META-INF/MANIFEST.MF b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/META-INF/MANIFEST.MF
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/META-INF/MANIFEST.MF
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/META-INF/MANIFEST.MF

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/about.html

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/about.html b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/about.html
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/about.html
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/about.html

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/build.properties

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/build.properties b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/build.properties
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/build.properties
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/build.properties

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/plugin.xml

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/plugin.xml b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/plugin.xml
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/plugin.xml
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/plugin.xml

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/pom.xml

diff --git a/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/pom.xml b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/pom.xml
new file mode 100755
index 0000000..ddfb6c2
--- /dev/null
+++ b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/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.incubation.alf</groupId>
+		<artifactId>org.eclipse.papyrus.alf.core</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.uml.alf.transaction</artifactId>
+	<version>0.7.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/ActivatorTransaction.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/ActivatorTransaction.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/ActivatorTransaction.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/ActivatorTransaction.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/ActivatorTransaction.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/AlfCommand.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/AlfCommand.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/AlfCommand.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/AlfCommand.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/AlfCommand.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/AlfCommandFactory.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/AlfCommandFactory.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/AlfCommandFactory.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/AlfCommandFactory.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/AlfCommandFactory.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/AlfCommandLabels.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/AlfCommandLabels.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/AlfCommandLabels.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/AlfCommandLabels.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/AlfCommandLabels.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/CompileCommand.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/CompileCommand.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/CompileCommand.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/CompileCommand.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/CompileCommand.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/SaveCommand.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/SaveCommand.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/SaveCommand.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/SaveCommand.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/SaveCommand.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/VersioningSaveCommand.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/VersioningSaveCommand.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/VersioningSaveCommand.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/VersioningSaveCommand.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commands/VersioningSaveCommand.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/ChangeScenario.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/ChangeScenario.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/ChangeScenario.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/ChangeScenario.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/ChangeScenario.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/CommitScenario.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/CommitScenario.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/CommitScenario.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/CommitScenario.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/CommitScenario.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/IChangeScenario.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/IChangeScenario.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/IChangeScenario.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/IChangeScenario.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/IChangeScenario.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/IScenario.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/IScenario.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/IScenario.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/IScenario.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/IScenario.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/ISyncScenario.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/ISyncScenario.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/ISyncScenario.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/ISyncScenario.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/ISyncScenario.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/SaveScenario.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/SaveScenario.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/SaveScenario.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/SaveScenario.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/SaveScenario.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/Scenario.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/Scenario.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/Scenario.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/Scenario.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/Scenario.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/ScenarioFactory.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/ScenarioFactory.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/ScenarioFactory.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/ScenarioFactory.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/ScenarioFactory.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/SyncScenario.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/SyncScenario.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/SyncScenario.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/SyncScenario.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/SyncScenario.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/AlfAbstractJob.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/AlfAbstractJob.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/AlfAbstractJob.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/AlfAbstractJob.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/AlfAbstractJob.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/AlfCompilationJob.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/AlfCompilationJob.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/AlfCompilationJob.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/AlfCompilationJob.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/AlfCompilationJob.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/AlfJobObserver.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/AlfJobObserver.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/AlfJobObserver.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/AlfJobObserver.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/AlfJobObserver.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/SaveTextualRepresentationJob.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/SaveTextualRepresentationJob.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/SaveTextualRepresentationJob.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/SaveTextualRepresentationJob.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/SaveTextualRepresentationJob.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/FUMLElementService.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/FUMLElementService.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/FUMLElementService.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/FUMLElementService.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/FUMLElementService.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/listener/FUMLElementListener.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/listener/FUMLElementListener.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/listener/FUMLElementListener.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/listener/FUMLElementListener.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/listener/FUMLElementListener.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/listener/filter/FUMLFilter.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/listener/filter/FUMLFilter.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/listener/filter/FUMLFilter.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/listener/filter/FUMLFilter.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/listener/filter/FUMLFilter.java

alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/listener/filter/FUMLScopeUtil.java

diff --git a/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/listener/filter/FUMLScopeUtil.java b/alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/listener/filter/FUMLScopeUtil.java
similarity index 100%
rename from alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/listener/filter/FUMLScopeUtil.java
rename to alf/plugins/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/observation/listener/filter/FUMLScopeUtil.java

alf/plugins/core/pom.xml

diff --git a/alf/plugins/core/pom.xml b/alf/plugins/core/pom.xml
new file mode 100755
index 0000000..3475d26
--- /dev/null
+++ b/alf/plugins/core/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.incubation.alf</groupId>
+		<artifactId>org.eclipse.papyrus.alf.plugins</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.alf.core</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.uml.alf.text</module>
+		<module>org.eclipse.papyrus.uml.alf.transaction</module>
+	</modules>	
+	
+</project>
\ No newline at end of file

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/.classpath

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/.classpath b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/.classpath
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/.classpath
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/.classpath

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/.project

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/.project b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/.project
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/.project
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/.project

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/.settings/net.sf.jautodoc.prefs

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/.settings/net.sf.jautodoc.prefs b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/.settings/net.sf.jautodoc.prefs
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/.settings/net.sf.jautodoc.prefs
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/.settings/net.sf.jautodoc.prefs

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/.settings/org.eclipse.jdt.core.prefs

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/.settings/org.eclipse.jdt.core.prefs
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/.settings/org.eclipse.jdt.core.prefs

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/META-INF/MANIFEST.MF

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/META-INF/MANIFEST.MF b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/META-INF/MANIFEST.MF
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/META-INF/MANIFEST.MF

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/about.html

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/about.html b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/about.html
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/about.html
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/about.html

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/build.properties

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/build.properties b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/build.properties
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/build.properties
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/build.properties

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/plugin.xml

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/plugin.xml b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/plugin.xml
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/plugin.xml
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/plugin.xml

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/plugin.xml_gen

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/plugin.xml_gen b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/plugin.xml_gen
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/plugin.xml_gen
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/plugin.xml_gen

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/pom.xml

diff --git a/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/pom.xml b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/pom.xml
new file mode 100755
index 0000000..02ad185
--- /dev/null
+++ b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/pom.xml
@@ -0,0 +1,14 @@
+<?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.incubation.alf</groupId>
+		<artifactId>org.eclipse.papyrus.alf.parent</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.operation.editor.xtext.ui</artifactId>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/AbstractOperationUiModule.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/AbstractOperationUiModule.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/AbstractOperationUiModule.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/AbstractOperationUiModule.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/AbstractOperationUiModule.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/OperationExecutableExtensionFactory.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/OperationExecutableExtensionFactory.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/OperationExecutableExtensionFactory.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/OperationExecutableExtensionFactory.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/OperationExecutableExtensionFactory.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/AbstractOperationProposalProvider.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/AbstractOperationProposalProvider.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/AbstractOperationProposalProvider.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/AbstractOperationProposalProvider.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/AbstractOperationProposalProvider.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/OperationParser.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/OperationParser.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/OperationParser.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/OperationParser.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/OperationParser.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/internal/InternalOperation.g

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/internal/InternalOperation.g b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/internal/InternalOperation.g
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/internal/InternalOperation.g
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/internal/InternalOperation.g

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/internal/InternalOperation.tokens

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/internal/InternalOperation.tokens b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/internal/InternalOperation.tokens
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/internal/InternalOperation.tokens
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/internal/InternalOperation.tokens

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/internal/InternalOperationLexer.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/internal/InternalOperationLexer.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/internal/InternalOperationLexer.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/internal/InternalOperationLexer.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/internal/InternalOperationLexer.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/internal/InternalOperationParser.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/internal/InternalOperationParser.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/internal/InternalOperationParser.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/internal/InternalOperationParser.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/antlr/internal/InternalOperationParser.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/internal/OperationActivator.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/internal/OperationActivator.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/internal/OperationActivator.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/internal/OperationActivator.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src-gen/org/eclipse/papyrus/operation/editor/xtext/ui/internal/OperationActivator.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/OperationUiModule.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/OperationUiModule.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/OperationUiModule.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/OperationUiModule.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/OperationUiModule.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/OperationProposalProvider.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/OperationProposalProvider.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/OperationProposalProvider.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/OperationProposalProvider.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/contentassist/OperationProposalProvider.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/contributions/OperationPopupEditorConfigurationContribution.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/contributions/OperationPopupEditorConfigurationContribution.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/contributions/OperationPopupEditorConfigurationContribution.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/contributions/OperationPopupEditorConfigurationContribution.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/contributions/OperationPopupEditorConfigurationContribution.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/labeling/OperationDescriptionLabelProvider.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/labeling/OperationDescriptionLabelProvider.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/labeling/OperationDescriptionLabelProvider.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/labeling/OperationDescriptionLabelProvider.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/labeling/OperationDescriptionLabelProvider.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/labeling/OperationLabelProvider.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/labeling/OperationLabelProvider.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/labeling/OperationLabelProvider.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/labeling/OperationLabelProvider.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/labeling/OperationLabelProvider.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/outline/OperationOutlineTreeProvider.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/outline/OperationOutlineTreeProvider.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/outline/OperationOutlineTreeProvider.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/outline/OperationOutlineTreeProvider.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/outline/OperationOutlineTreeProvider.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/quickfix/OperationQuickfixProvider.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/quickfix/OperationQuickfixProvider.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/quickfix/OperationQuickfixProvider.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/quickfix/OperationQuickfixProvider.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext.ui/src/org/eclipse/papyrus/operation/editor/xtext/ui/quickfix/OperationQuickfixProvider.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/.antlr-generator-3.2.0.jar

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/.antlr-generator-3.2.0.jar b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/.antlr-generator-3.2.0.jar
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/.antlr-generator-3.2.0.jar
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/.antlr-generator-3.2.0.jar
Binary files differ

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/.classpath

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/.classpath b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/.classpath
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/.classpath
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/.classpath

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/.project

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/.project b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/.project
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/.project
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/.project

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/.settings/net.sf.jautodoc.prefs

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/.settings/net.sf.jautodoc.prefs b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/.settings/net.sf.jautodoc.prefs
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/.settings/net.sf.jautodoc.prefs
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/.settings/net.sf.jautodoc.prefs

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/.settings/org.eclipse.jdt.core.prefs

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/.settings/org.eclipse.jdt.core.prefs b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/.settings/org.eclipse.jdt.core.prefs
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/.settings/org.eclipse.jdt.core.prefs

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/META-INF/MANIFEST.MF

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/META-INF/MANIFEST.MF b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/META-INF/MANIFEST.MF
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/META-INF/MANIFEST.MF
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/META-INF/MANIFEST.MF

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/about.html

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/about.html b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/about.html
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/about.html
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/about.html

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/build.properties

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/build.properties b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/build.properties
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/build.properties
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/build.properties

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/model/Ecore.ecore

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/model/Ecore.ecore b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/model/Ecore.ecore
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/model/Ecore.ecore
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/model/Ecore.ecore

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/model/Ecore.genmodel

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/model/Ecore.genmodel b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/model/Ecore.genmodel
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/model/Ecore.genmodel
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/model/Ecore.genmodel

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/model/UML.ecore

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/model/UML.ecore b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/model/UML.ecore
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/model/UML.ecore
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/model/UML.ecore

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/model/UML.genmodel

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/model/UML.genmodel b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/model/UML.genmodel
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/model/UML.genmodel
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/model/UML.genmodel

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/plugin.properties

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/plugin.properties b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/plugin.properties
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/plugin.properties
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/plugin.properties

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/plugin.xml

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/plugin.xml b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/plugin.xml
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/plugin.xml
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/plugin.xml

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/plugin.xml_gen

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/plugin.xml_gen b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/plugin.xml_gen
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/plugin.xml_gen
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/plugin.xml_gen

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/pom.xml

diff --git a/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/pom.xml b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/pom.xml
new file mode 100755
index 0000000..b17d146
--- /dev/null
+++ b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/pom.xml
@@ -0,0 +1,14 @@
+<?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.incubation.alf</groupId>
+		<artifactId>org.eclipse.papyrus.alf.parent</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.operation.editor.xtext</artifactId>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/AbstractOperationRuntimeModule.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/AbstractOperationRuntimeModule.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/AbstractOperationRuntimeModule.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/AbstractOperationRuntimeModule.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/AbstractOperationRuntimeModule.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/Operation.ecore

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/Operation.ecore b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/Operation.ecore
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/Operation.ecore
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/Operation.ecore

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/Operation.genmodel

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/Operation.genmodel b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/Operation.genmodel
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/Operation.genmodel
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/Operation.genmodel

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/Operation.xmi

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/Operation.xmi b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/Operation.xmi
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/Operation.xmi
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/Operation.xmi

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/OperationStandaloneSetupGenerated.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/OperationStandaloneSetupGenerated.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/OperationStandaloneSetupGenerated.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/OperationStandaloneSetupGenerated.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/OperationStandaloneSetupGenerated.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/FormalParameter.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/FormalParameter.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/FormalParameter.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/FormalParameter.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/FormalParameter.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/FormalParameterList.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/FormalParameterList.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/FormalParameterList.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/FormalParameterList.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/FormalParameterList.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/FormalParameters.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/FormalParameters.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/FormalParameters.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/FormalParameters.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/FormalParameters.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/INTEGER_LITERAL_WITHOUT_SUFFIX.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/INTEGER_LITERAL_WITHOUT_SUFFIX.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/INTEGER_LITERAL_WITHOUT_SUFFIX.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/INTEGER_LITERAL_WITHOUT_SUFFIX.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/INTEGER_LITERAL_WITHOUT_SUFFIX.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/Multiplicity.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/Multiplicity.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/Multiplicity.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/Multiplicity.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/Multiplicity.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/MultiplicityRange.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/MultiplicityRange.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/MultiplicityRange.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/MultiplicityRange.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/MultiplicityRange.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/NUMBER_LITERAL_WITHOUT_SUFFIX.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/NUMBER_LITERAL_WITHOUT_SUFFIX.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/NUMBER_LITERAL_WITHOUT_SUFFIX.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/NUMBER_LITERAL_WITHOUT_SUFFIX.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/NUMBER_LITERAL_WITHOUT_SUFFIX.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/OperationDeclaration.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/OperationDeclaration.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/OperationDeclaration.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/OperationDeclaration.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/OperationDeclaration.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/OperationDefinitionOrStub.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/OperationDefinitionOrStub.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/OperationDefinitionOrStub.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/OperationDefinitionOrStub.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/OperationDefinitionOrStub.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/OperationFactory.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/OperationFactory.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/OperationFactory.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/OperationFactory.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/OperationFactory.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/OperationPackage.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/OperationPackage.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/OperationPackage.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/OperationPackage.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/OperationPackage.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/ParameterDirection.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/ParameterDirection.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/ParameterDirection.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/ParameterDirection.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/ParameterDirection.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/RedefinitionClause.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/RedefinitionClause.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/RedefinitionClause.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/RedefinitionClause.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/RedefinitionClause.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/TypeName.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/TypeName.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/TypeName.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/TypeName.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/TypeName.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/TypePart.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/TypePart.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/TypePart.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/TypePart.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/TypePart.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/UNLIMITED_LITERAL_WITHOUT_SUFFIX.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/UNLIMITED_LITERAL_WITHOUT_SUFFIX.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/UNLIMITED_LITERAL_WITHOUT_SUFFIX.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/UNLIMITED_LITERAL_WITHOUT_SUFFIX.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/UNLIMITED_LITERAL_WITHOUT_SUFFIX.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/VisibilityIndicator.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/VisibilityIndicator.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/VisibilityIndicator.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/VisibilityIndicator.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/VisibilityIndicator.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/FormalParameterImpl.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/FormalParameterImpl.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/FormalParameterImpl.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/FormalParameterImpl.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/FormalParameterImpl.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/FormalParameterListImpl.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/FormalParameterListImpl.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/FormalParameterListImpl.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/FormalParameterListImpl.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/FormalParameterListImpl.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/FormalParametersImpl.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/FormalParametersImpl.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/FormalParametersImpl.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/FormalParametersImpl.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/FormalParametersImpl.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/INTEGER_LITERAL_WITHOUT_SUFFIXImpl.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/INTEGER_LITERAL_WITHOUT_SUFFIXImpl.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/INTEGER_LITERAL_WITHOUT_SUFFIXImpl.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/INTEGER_LITERAL_WITHOUT_SUFFIXImpl.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/INTEGER_LITERAL_WITHOUT_SUFFIXImpl.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/MultiplicityImpl.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/MultiplicityImpl.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/MultiplicityImpl.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/MultiplicityImpl.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/MultiplicityImpl.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/MultiplicityRangeImpl.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/MultiplicityRangeImpl.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/MultiplicityRangeImpl.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/MultiplicityRangeImpl.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/MultiplicityRangeImpl.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/NUMBER_LITERAL_WITHOUT_SUFFIXImpl.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/NUMBER_LITERAL_WITHOUT_SUFFIXImpl.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/NUMBER_LITERAL_WITHOUT_SUFFIXImpl.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/NUMBER_LITERAL_WITHOUT_SUFFIXImpl.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/NUMBER_LITERAL_WITHOUT_SUFFIXImpl.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/OperationDeclarationImpl.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/OperationDeclarationImpl.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/OperationDeclarationImpl.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/OperationDeclarationImpl.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/OperationDeclarationImpl.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/OperationDefinitionOrStubImpl.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/OperationDefinitionOrStubImpl.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/OperationDefinitionOrStubImpl.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/OperationDefinitionOrStubImpl.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/OperationDefinitionOrStubImpl.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/OperationFactoryImpl.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/OperationFactoryImpl.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/OperationFactoryImpl.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/OperationFactoryImpl.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/OperationFactoryImpl.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/OperationPackageImpl.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/OperationPackageImpl.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/OperationPackageImpl.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/OperationPackageImpl.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/OperationPackageImpl.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/RedefinitionClauseImpl.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/RedefinitionClauseImpl.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/RedefinitionClauseImpl.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/RedefinitionClauseImpl.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/RedefinitionClauseImpl.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/TypeNameImpl.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/TypeNameImpl.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/TypeNameImpl.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/TypeNameImpl.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/TypeNameImpl.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/TypePartImpl.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/TypePartImpl.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/TypePartImpl.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/TypePartImpl.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/TypePartImpl.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/UNLIMITED_LITERAL_WITHOUT_SUFFIXImpl.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/UNLIMITED_LITERAL_WITHOUT_SUFFIXImpl.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/UNLIMITED_LITERAL_WITHOUT_SUFFIXImpl.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/UNLIMITED_LITERAL_WITHOUT_SUFFIXImpl.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/impl/UNLIMITED_LITERAL_WITHOUT_SUFFIXImpl.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/util/OperationAdapterFactory.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/util/OperationAdapterFactory.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/util/OperationAdapterFactory.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/util/OperationAdapterFactory.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/util/OperationAdapterFactory.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/util/OperationSwitch.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/util/OperationSwitch.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/util/OperationSwitch.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/util/OperationSwitch.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/operation/util/OperationSwitch.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parseTreeConstruction/OperationParsetreeConstructor.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parseTreeConstruction/OperationParsetreeConstructor.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parseTreeConstruction/OperationParsetreeConstructor.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parseTreeConstruction/OperationParsetreeConstructor.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parseTreeConstruction/OperationParsetreeConstructor.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/OperationAntlrTokenFileProvider.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/OperationAntlrTokenFileProvider.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/OperationAntlrTokenFileProvider.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/OperationAntlrTokenFileProvider.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/OperationAntlrTokenFileProvider.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/OperationParser.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/OperationParser.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/OperationParser.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/OperationParser.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/OperationParser.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/internal/InternalOperation.g

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/internal/InternalOperation.g b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/internal/InternalOperation.g
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/internal/InternalOperation.g
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/internal/InternalOperation.g

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/internal/InternalOperation.tokens

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/internal/InternalOperation.tokens b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/internal/InternalOperation.tokens
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/internal/InternalOperation.tokens
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/internal/InternalOperation.tokens

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/internal/InternalOperationLexer.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/internal/InternalOperationLexer.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/internal/InternalOperationLexer.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/internal/InternalOperationLexer.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/internal/InternalOperationLexer.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/internal/InternalOperationParser.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/internal/InternalOperationParser.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/internal/InternalOperationParser.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/internal/InternalOperationParser.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/parser/antlr/internal/InternalOperationParser.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/services/OperationGrammarAccess.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/services/OperationGrammarAccess.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/services/OperationGrammarAccess.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/services/OperationGrammarAccess.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/services/OperationGrammarAccess.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/validation/AbstractOperationJavaValidator.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/validation/AbstractOperationJavaValidator.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/validation/AbstractOperationJavaValidator.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/validation/AbstractOperationJavaValidator.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src-gen/org/eclipse/papyrus/operation/editor/xtext/validation/AbstractOperationJavaValidator.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/GenerateOperation.mwe2

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/GenerateOperation.mwe2 b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/GenerateOperation.mwe2
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/GenerateOperation.mwe2
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/GenerateOperation.mwe2

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/Operation.xtext

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/Operation.xtext b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/Operation.xtext
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/Operation.xtext
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/Operation.xtext

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/OperationRuntimeModule.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/OperationRuntimeModule.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/OperationRuntimeModule.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/OperationRuntimeModule.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/OperationRuntimeModule.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/OperationStandaloneSetup.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/OperationStandaloneSetup.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/OperationStandaloneSetup.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/OperationStandaloneSetup.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/OperationStandaloneSetup.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/formatting/OperationFormatter.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/formatting/OperationFormatter.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/formatting/OperationFormatter.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/formatting/OperationFormatter.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/formatting/OperationFormatter.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/scoping/OperationEditorScopingTool.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/scoping/OperationEditorScopingTool.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/scoping/OperationEditorScopingTool.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/scoping/OperationEditorScopingTool.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/scoping/OperationEditorScopingTool.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/scoping/OperationScopeProvider.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/scoping/OperationScopeProvider.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/scoping/OperationScopeProvider.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/scoping/OperationScopeProvider.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/scoping/OperationScopeProvider.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/utils/AlfParsingUtil.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/utils/AlfParsingUtil.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/utils/AlfParsingUtil.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/utils/AlfParsingUtil.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/utils/AlfParsingUtil.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/OperationJavaValidator.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/OperationJavaValidator.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/OperationJavaValidator.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/OperationJavaValidator.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/OperationJavaValidator.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/OperationSemanticValidator.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/OperationSemanticValidator.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/OperationSemanticValidator.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/OperationSemanticValidator.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/OperationSemanticValidator.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/typing/OperationEditorAssignmentPolicy.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/typing/OperationEditorAssignmentPolicy.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/typing/OperationEditorAssignmentPolicy.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/typing/OperationEditorAssignmentPolicy.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/typing/OperationEditorAssignmentPolicy.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/typing/OperationEditorMultiplicityFacadeFactory.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/typing/OperationEditorMultiplicityFacadeFactory.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/typing/OperationEditorMultiplicityFacadeFactory.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/typing/OperationEditorMultiplicityFacadeFactory.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/typing/OperationEditorMultiplicityFacadeFactory.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/typing/OperationEditorSignatureFacadeFactory.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/typing/OperationEditorSignatureFacadeFactory.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/typing/OperationEditorSignatureFacadeFactory.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/typing/OperationEditorSignatureFacadeFactory.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/typing/OperationEditorSignatureFacadeFactory.java

alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/typing/OperationEditorTypeFacadeFactory.java

diff --git a/alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/typing/OperationEditorTypeFacadeFactory.java b/alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/typing/OperationEditorTypeFacadeFactory.java
similarity index 100%
rename from alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/typing/OperationEditorTypeFacadeFactory.java
rename to alf/plugins/editor/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/validation/typing/OperationEditorTypeFacadeFactory.java

alf/plugins/editor/pom.xml

diff --git a/alf/plugins/editor/pom.xml b/alf/plugins/editor/pom.xml
new file mode 100755
index 0000000..1d47773
--- /dev/null
+++ b/alf/plugins/editor/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.incubation.alf</groupId>
+		<artifactId>org.eclipse.papyrus.alf.plugins</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.alf.operation.editor</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.operation.editor.xtext.ui</module> 
+		<module>org.eclipse.papyrus.operation.editor.xtext</module>
+	</modules>	
+	
+</project>
\ No newline at end of file

alf/plugins/pom.xml

diff --git a/alf/plugins/pom.xml b/alf/plugins/pom.xml
new file mode 100755
index 0000000..3fe53a1
--- /dev/null
+++ b/alf/plugins/pom.xml
@@ -0,0 +1,23 @@
+<?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.incubation.alf</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.alf.parent</artifactId>	
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.alf.plugins</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>core</module>
+		<module>ui</module>
+		<!-- FIXME: was present in Papyrus core repositoy but unused in the build
+		 Missing org.eclipse.xtext.gmf.glue 0.8.0'
+		 <module>editor</module> -->
+	</modules>	
+	
+</project>
\ No newline at end of file

alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/.classpath

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.preferences/.classpath b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/.classpath
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.preferences/.classpath
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/.classpath

alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/.project

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.preferences/.project b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/.project
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.preferences/.project
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/.project

alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/.settings/org.eclipse.jdt.core.prefs

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.preferences/.settings/org.eclipse.jdt.core.prefs b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.preferences/.settings/org.eclipse.jdt.core.prefs
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/.settings/org.eclipse.jdt.core.prefs

alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/.settings/org.eclipse.jdt.ui.prefs

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.preferences/.settings/org.eclipse.jdt.ui.prefs b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.preferences/.settings/org.eclipse.jdt.ui.prefs
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/.settings/org.eclipse.jdt.ui.prefs

alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/META-INF/MANIFEST.MF

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.preferences/META-INF/MANIFEST.MF b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/META-INF/MANIFEST.MF
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.preferences/META-INF/MANIFEST.MF
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/META-INF/MANIFEST.MF

alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/about.html

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.preferences/about.html b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/about.html
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.preferences/about.html
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/about.html

alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/build.properties

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.preferences/build.properties b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/build.properties
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.preferences/build.properties
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/build.properties

alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/plugin.xml

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.preferences/plugin.xml b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/plugin.xml
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.preferences/plugin.xml
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/plugin.xml

alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/pom.xml

diff --git a/alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/pom.xml b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/pom.xml
new file mode 100755
index 0000000..63bf3b7
--- /dev/null
+++ b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/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.incubation.alf</groupId>
+		<artifactId>org.eclipse.papyrus.alf.ui</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.uml.alf.preferences</artifactId>
+	<version>0.7.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file

alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/Activator.java

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/Activator.java b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/Activator.java
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/Activator.java
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/Activator.java

alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferences.java

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferences.java b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferences.java
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferences.java
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferences.java

alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferencesConstants.java

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferencesConstants.java b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferencesConstants.java
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferencesConstants.java
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferencesConstants.java

alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferencesUtil.java

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferencesUtil.java b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferencesUtil.java
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferencesUtil.java
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.preferences/src/org/eclipse/papyrus/uml/alf/preferences/AlfIntegrationPreferencesUtil.java

alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/.classpath

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/.classpath b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/.classpath
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/.classpath
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/.classpath

alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/.project

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/.project b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/.project
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/.project
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/.project

alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/.settings/org.eclipse.jdt.core.prefs

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/.settings/org.eclipse.jdt.core.prefs b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/.settings/org.eclipse.jdt.core.prefs
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/.settings/org.eclipse.jdt.core.prefs

alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/.settings/org.eclipse.jdt.ui.prefs

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/.settings/org.eclipse.jdt.ui.prefs b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/.settings/org.eclipse.jdt.ui.prefs
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/.settings/org.eclipse.jdt.ui.prefs

alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/META-INF/MANIFEST.MF

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/META-INF/MANIFEST.MF b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/META-INF/MANIFEST.MF
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/META-INF/MANIFEST.MF
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/META-INF/MANIFEST.MF

alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/about.html

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/about.html b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/about.html
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/about.html
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/about.html

alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/build.properties

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/build.properties b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/build.properties
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/build.properties
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/build.properties

alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/plugin.xml

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/plugin.xml b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/plugin.xml
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/plugin.xml
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/plugin.xml

alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/pom.xml

diff --git a/alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/pom.xml b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/pom.xml
new file mode 100755
index 0000000..028a121
--- /dev/null
+++ b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/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.incubation.alf</groupId>
+		<artifactId>org.eclipse.papyrus.alf.ui</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.uml.alf.properties.xtext</artifactId>
+	<version>0.7.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file

alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/resources/icons/incom_stat.gif

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/resources/icons/incom_stat.gif b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/resources/icons/incom_stat.gif
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/resources/icons/incom_stat.gif
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/resources/icons/incom_stat.gif
Binary files differ

alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/ActivatorALFProperties.java

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/ActivatorALFProperties.java b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/ActivatorALFProperties.java
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/ActivatorALFProperties.java
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/ActivatorALFProperties.java

alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/UndoRedoStack.java

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/UndoRedoStack.java b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/UndoRedoStack.java
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/UndoRedoStack.java
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/UndoRedoStack.java

alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/AlfEditionPropertySection.java

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/AlfEditionPropertySection.java b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/AlfEditionPropertySection.java
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/AlfEditionPropertySection.java
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/AlfEditionPropertySection.java

alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/AlfEditorPropertySectionFilter.java

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/AlfEditorPropertySectionFilter.java b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/AlfEditorPropertySectionFilter.java
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/AlfEditorPropertySectionFilter.java
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/AlfEditorPropertySectionFilter.java

alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/tooling/StyledTextWithUndoRedo.java

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/tooling/StyledTextWithUndoRedo.java b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/tooling/StyledTextWithUndoRedo.java
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/tooling/StyledTextWithUndoRedo.java
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/tooling/StyledTextWithUndoRedo.java

alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/ui/listeners/CommitButtonSelectionListener.java

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/ui/listeners/CommitButtonSelectionListener.java b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/ui/listeners/CommitButtonSelectionListener.java
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/ui/listeners/CommitButtonSelectionListener.java
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/ui/listeners/CommitButtonSelectionListener.java

alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/ui/listeners/EditorFocusListener.java

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/ui/listeners/EditorFocusListener.java b/alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/ui/listeners/EditorFocusListener.java
similarity index 100%
rename from alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/ui/listeners/EditorFocusListener.java
rename to alf/plugins/ui/org.eclipse.papyrus.uml.alf.properties.xtext/src/org/eclipse/papyrus/uml/alf/properties/xtext/sheet/ui/listeners/EditorFocusListener.java

alf/plugins/ui/pom.xml

diff --git a/alf/plugins/ui/pom.xml b/alf/plugins/ui/pom.xml
new file mode 100755
index 0000000..e0fcd25
--- /dev/null
+++ b/alf/plugins/ui/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.incubation.alf</groupId>
+		<artifactId>org.eclipse.papyrus.alf.plugins</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.alf.ui</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.uml.alf.preferences</module>
+		<module>org.eclipse.papyrus.uml.alf.properties.xtext</module>
+	</modules>	
+	
+</project>
\ No newline at end of file

alf/pom.xml

diff --git a/alf/pom.xml b/alf/pom.xml
index 8839487..ab6f413 100755
--- a/alf/pom.xml
+++ b/alf/pom.xml
@@ -1,26 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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</groupId>
-		<artifactId>org.eclipse.papyrus.incubation</artifactId>		
-		<version>3.0.0-SNAPSHOT</version>
+		<groupId>org.eclipse.papyrus.incubation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.all</artifactId>		
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	
-	<artifactId>org.eclipse.papyrus.alf.parent</artifactId>
+	<groupId>org.eclipse.papyrus.incubation.alf</groupId>
+	<artifactId>org.eclipse.papyrus.incubation.alf.parent</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<modules>
-		<module>core</module>
-		<module>ui</module>
-		<module>org.eclipse.papyrus.uml.alf.integration.feature</module>
-		
-		<!-- FIXME: was present in Papyrus core repositoy but unused in the build
-		<module>org.eclipse.papyrus.alf.sdk-feature</module>
-		 Missing org.eclipse.xtext.gmf.glue 0.8.0' 
-		       <module>org.eclipse.papyrus.operation.editor.xtext.ui</module> 
-			   <module>org.eclipse.papyrus.operation.editor.xtext</module>
-		-->
+		<module>plugins</module>
+		<module>features</module>
 	</modules>	
 	
+	<profiles>
+		<profile>
+			<id>alf</id>	
+			<properties>
+				<targetplatform.groupId>org.eclipse.papyrus.incubation.alf</targetplatform.groupId>
+				<targetplatform.artifactId>org.eclipse.papyrus.incubation.alf.targetplatform</targetplatform.artifactId>
+				<targetplatform.version>1.2.0-SNAPSHOT</targetplatform.version>
+			</properties>
+			
+			<modules>
+				<module>releng</module>
+			</modules>
+		</profile>
+	</profiles>
+	
 </project>
\ No newline at end of file

alf/releng/org.eclipse.papyrus.incubation.alf.p2/.project

diff --git a/alf/releng/org.eclipse.papyrus.incubation.alf.p2/.project b/alf/releng/org.eclipse.papyrus.incubation.alf.p2/.project
new file mode 100755
index 0000000..0a79233
--- /dev/null
+++ b/alf/releng/org.eclipse.papyrus.incubation.alf.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>

alf/releng/org.eclipse.papyrus.incubation.alf.p2/category.xml

diff --git a/alf/releng/org.eclipse.papyrus.incubation.alf.p2/category.xml b/alf/releng/org.eclipse.papyrus.incubation.alf.p2/category.xml
new file mode 100755
index 0000000..711eb18
--- /dev/null
+++ b/alf/releng/org.eclipse.papyrus.incubation.alf.p2/category.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+  <feature url="features/org.eclipse.papyrus.uml.alf.integration.feature_0.7.0.qualifier.jar" id="org.eclipse.papyrus.uml.alf.integration.feature" version="0.7.0.qualifier">
+      <category name="org.eclipse.papyrus.incubation.category"/>
+   </feature>
+   <feature url="features/org.eclipse.papyrus.uml.alf.integration.feature.source_0.7.0.qualifier.jar" id="org.eclipse.papyrus.uml.alf.integration.feature.source" version="0.7.0.qualifier">
+      <category name="org.eclipse.papyrus.incubation.category"/>
+   </feature>
+  
+  <category-def name="org.eclipse.papyrus.incubation.category" label="Papyrus Incubation">
+      <description>
+         Papyrus Incubation features
+      </description>
+   </category-def>
+</site>

alf/releng/org.eclipse.papyrus.incubation.alf.p2/pom.xml

diff --git a/alf/releng/org.eclipse.papyrus.incubation.alf.p2/pom.xml b/alf/releng/org.eclipse.papyrus.incubation.alf.p2/pom.xml
new file mode 100755
index 0000000..9a86ea9
--- /dev/null
+++ b/alf/releng/org.eclipse.papyrus.incubation.alf.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.incubation.alf</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.alf.releng</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.alf.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

alf/releng/pom.xml

diff --git a/alf/releng/pom.xml b/alf/releng/pom.xml
new file mode 100755
index 0000000..cb8d73c
--- /dev/null
+++ b/alf/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.incubation.alf</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.alf.parent</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.alf.releng</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>targetplatform</module>
+		<module>org.eclipse.papyrus.incubation.alf.p2</module>
+	</modules>	
+	
+</project>
\ No newline at end of file

alf/releng/promote/diagramtemplate.sh

diff --git a/alf/releng/promote/diagramtemplate.sh b/alf/releng/promote/diagramtemplate.sh
new file mode 100755
index 0000000..b913d53
--- /dev/null
+++ b/alf/releng/promote/diagramtemplate.sh
@@ -0,0 +1,258 @@
+#Based upon Gef4 publish.sh script
+
+#causes the shell to exit if any subcommand or pipeline returns a non-zero status.
+#set -e
+
+# Script may take 5-6 command line parameters:
+# $1: Hudson job name: <name>
+# $2: Hudson build id: <id>
+# $3: Build type: i(ntegration), s(table), r(elease)
+# $4: The release label used to label the drop files, e.g. 3.10.0 or 3.10.1
+# $5: The eclipse target version, e.g. mars or neon
+# $6: Override if exists
+# $7: An optional release label suffix to be appended to drop files name, e.g. M1, RC1 
+
+##Additional variables to specify for each project
+
+#The root url that enables to find the job with ${hudsonJobRootUrl}/$jobName/$buildNumber
+hudsonJobRootUrl="https://hudson.eclipse.org/papyrus/job"
+
+#The name of the tool
+repo="incubation"
+subRepo="alf"
+updates="updates"
+drops="downloads/drops"
+
+#The specific localization
+remoteRoot="/home/data/httpd/download.eclipse.org"
+papyrusRoot="modeling/mdt/papyrus"
+remoteUpdateSiteRoot=${remoteRoot}/${papyrusRoot}/${repo}
+remoteUpdateSite=${remoteUpdateSiteRoot}/${subRepo}
+remoteUpdateSiteDir=${remoteUpdateSite}/${updates}
+echo "remoteUpdateSiteDir: $remoteUpdateSiteDir"
+
+#The localization of the local build target
+targetResults="archive/${subRepo}/releng/org.eclipse.papyrus.${repo}.${subRepo}.p2/target/repository"
+echo "targetResults: $targetResults"
+
+#The rcpPrompote.sh script may be used to publish the Incubation build results. 
+#if [ $# -eq 6 -o $# -eq 7  ];
+#then
+#	jobName=$1
+jobName="Papyrus-Incubation-DiagramTemplate"
+	echo "jobName: $jobName"
+#	buildNumber=$2
+buildNumber="4"
+	echo "buildNumber: $buildNumber"
+#	releaseType=$3
+releaseType="i"
+	echo "releaseType: $releaseType"
+#	releaseLabel=$4	
+releaseLabel="1.2.0"
+	echo "releaseLabel: $releaseLabel"
+#	eclipseTarget=$5
+eclipseTarget="oxygen"	
+	echo "eclipseTarget: $eclipseTarget"
+#	override=$6	
+override="y"
+	echo "override: $override"
+
+	if [ -n "$7" ];
+	then
+		releaseLabelSuffix=$7
+		echo "releaseLabelSuffix: $releaseLabelSuffix"
+	fi
+#else
+#	echo "Missing so parameters: command jobName buildNumber releaseType releaseLabel eclipseTarget override [releaseLabelSuffix]"
+#	exit 1;
+#fi
+
+###########jobName parameter###########
+if [ -z "$jobName" ];
+then
+	echo "The Hudson job you want to promote must be specified"
+	exit 1
+fi
+
+###########buildNumber parameter###########
+if [ -z "$buildNumber" ];
+then
+	echo "The id of the $jobName build you want to promote must be specified"
+	exit 1
+fi
+
+###########releaseType parameter###########
+if [ -z "$releaseType" ];
+then
+    echo "The type of build you want to publish to [i(integration), s(table), r(elease)]."
+    exit;
+fi
+echo "Publishing as $releaseType build"
+
+###########releaseLabel parameter###########
+if [ -z "$releaseLabel" ];
+then
+    echo "The release label (e.g. 3.10.0, 3.10.1M2) must be specified."
+    exit 1
+fi
+echo "Release label: $releaseLabel"
+
+###########eclipseTarget parameter###########
+if [ -z "$eclipseTarget" ];
+then
+    echo "The Eclipse target (e.g. mars, neon) must be specified."
+    exit 1
+fi
+echo "Eclipse target : $eclipseTarget"
+
+###########Override parameter###########
+if [ "$override" != y -a "$override" != n ];
+then
+	echo "Parameter override has to 'y'(es) or 'n'(o) but was: $override"
+    exit 0
+fi
+
+if [ "$override" == "y" ];
+then
+	echo "Will override the previous artifacts if found"
+else
+	echo "Will not override the previous arifacts if found"
+fi
+
+########### Compute local build results using buildNumber ###########
+if [ "$buildNumber" = "lastStable" -o "$buildNumber" = "lastSuccessful" ];
+then
+	# Reverse lookup the build id (in case lastSuccessful or lastStable was used)
+	for i in $(find ~/.hudson/jobs/$jobName/builds/ -type l)
+	do
+		if [ "$(readlink -f $i)" = "$(readlink -f ~/.hudson/jobs/$jobName/$buildNumber)" ];
+		then
+			buildNumber=${i##*/}
+		fi
+	done
+	echo "Reverse lookup (lastStable/lastSuccessful) yielded buildNumber: $buildNumber"
+fi
+
+echo "~/.hudson/jobs/${jobName}/builds/${buildNumber}"
+jobDir=$(readlink -f ~/.hudson/jobs/${jobName}/builds/${buildNumber})
+if ! [ -d $jobDir ];
+then
+	echo "The specified buildNumber does not refer to an existing build: $buildNumber"
+	exit 1
+fi
+
+localResults=${jobDir}/${targetResults}
+echo "localResults: ${localResults}"
+
+########### Promote Job ###########
+destination=$remoteUpdateSiteDir/$eclipseTarget/${releaseLabel}${releaseLabelSuffix}
+echo "Destination: $destination"
+
+if [ "$override" == "n" ];
+then
+	if [ -d $destination ];
+	then
+		if [ "$(ls -A ${destination})" ];
+		then
+			echo "The destination is not empty. You may consider overriding or archiving"
+			exit 1
+		fi
+	fi
+fi
+
+if [ "$override" == "y" ];
+then
+	if [ -d $destination ];
+	then
+		echo "Overriding the RCP by cleaning the $destination folder"
+		rm -rf ${destination}/*
+	fi
+fi
+
+#Go to the artifact directory
+cd $localResults
+echo "Promoting the Job to $destination"
+#No error if exists, makes parent directories as needed
+mkdir -p $destination
+
+#Copy the contents onto the temp folder and change the permissions
+cp -R * $destination
+
+
+########### Update composites ###########
+# TODO update composite root ./eclipseTarget/* and parent ./*
+echo "Update Composites"
+timestamp=$(date +%s000)
+
+# This function indents the text with two white spaces
+indent() {
+sed 's/^/  /';
+}
+
+# This function is used to generate the composites
+function updateComposites() {
+cat > "compositeArtifacts.xml" <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<repository name="Papyrus" type="org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository" version="1.0.0">
+  <properties size="1">
+    <property name="p2.timestamp" value="$1"/>
+  </properties>
+  <children size="$2">
+$(	
+for file in *; do 
+if [ -d $file ]; then 
+    printf "<child location='${file}'/>" | indent | indent
+fi
+done
+)
+  </children>
+</repository>
+EOF
+
+cat > "compositeContent.xml" <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<repository name="Papyrus" type="org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" version="1.0.0">
+  <properties size="1">
+    <property name="p2.timestamp" value="$1"/>
+  </properties>
+  <children size="$2">
+$(	
+for file in *; do 
+if [ -d $file ]; then 
+    printf "<child location='${file}'/>" | indent | indent
+fi
+done
+)
+  </children>
+</repository>
+EOF
+}
+
+echo "Update root composites: $remoteUpdateSite"
+cd $remoteUpdateSite
+childrenCount=$(find . -maxdepth 1 -type d  \( ! -iname ".*" \) | wc -l)
+updateComposites $timestamp $childrenCount
+
+echo "Update eclipseTarget composites: $remoteUpdateSiteDir"
+cd $remoteUpdateSiteDir
+childrenCount=$(find . -maxdepth 1 -type d  \( ! -iname ".*" \) | wc -l)
+updateComposites $timestamp $childrenCount
+
+echo "Update releaseLabel composites: $remoteUpdateSiteDir/$eclipseTarget"
+cd $remoteUpdateSiteDir/$eclipseTarget
+childrenCount=$(find . -maxdepth 1 -type d  \( ! -iname ".*" \) | wc -l)
+updateComposites $timestamp $childrenCount
+
+
+########### Set Access Rights ###########
+
+# This function sets the acess rights to allow all memebers of the group to edit the files
+function setAccessRights() {
+	chmod -R 775 "$1"
+	chgrp -hR modeling.mdt.papyrus "$1"
+}
+echo "Set access right -R: $remoteUpdateSiteDir"
+setAccessRights $remoteUpdateSiteDir
+
+
+echo "publishing done."
\ No newline at end of file

alf/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.alf.targetplatform.target

diff --git a/alf/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.alf.targetplatform.target b/alf/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.alf.targetplatform.target
new file mode 100755
index 0000000..40330cb
--- /dev/null
+++ b/alf/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.alf.targetplatform.target
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Alf - Oxygen" sequenceNumber="1504218140">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ui" version="0.0.0"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/releases/oxygen/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.uml.alf" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.xtext.integration.ui" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.properties" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.alf.ui" version="0.0.0"/>
+      <repository id="Papyrus-Oxygen" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.uml2.uml" version="0.0.0"/>
+      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.3"/>
+    </location>
+  </locations>
+</target>

alf/releng/targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform/.project

diff --git a/alf/releng/targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform/.project b/alf/releng/targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform/.project
new file mode 100755
index 0000000..7477ea0
--- /dev/null
+++ b/alf/releng/targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.incubation.targetplatform.oxygen</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

alf/releng/targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform.target

diff --git a/alf/releng/targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform.target b/alf/releng/targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform.target
new file mode 100755
index 0000000..6646a0f
--- /dev/null
+++ b/alf/releng/targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform.target
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Alf - Oxygen" sequenceNumber="1504218140">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ui" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/releases/oxygen/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.uml.alf" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.xtext.integration.ui" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.properties" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.alf.ui" version="0.0.0"/>
+      <repository id="Papyrus-Oxygen" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.uml2.uml" version="0.0.0"/>
+      <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.3"/>
+    </location>
+  </locations>
+</target>

alf/releng/targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform.tpd

diff --git a/alf/releng/targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform.tpd b/alf/releng/targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform.tpd
new file mode 100755
index 0000000..52a3a0f
--- /dev/null
+++ b/alf/releng/targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform.tpd
@@ -0,0 +1,20 @@
+target "Alf - Oxygen" with source requirements
+
+location "http://download.eclipse.org/releases/oxygen/" {
+ org.eclipse.ui lazy
+
+}
+
+//manualUpdate
+location "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/" Papyrus-Oxygen {
+ org.eclipse.papyrus.uml.alf lazy
+ org.eclipse.papyrus.uml.xtext.integration.ui lazy
+ org.eclipse.papyrus.uml.properties lazy
+ org.eclipse.papyrus.uml.alf.ui lazy
+ 
+}
+
+//updateFrom("MDT UML2",0) 
+location uml "http://download.eclipse.org/modeling/mdt/uml2/updates/5.3" {
+ org.eclipse.uml2.uml lazy
+}
\ No newline at end of file

alf/releng/targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform/pom.xml

diff --git a/alf/releng/targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform/pom.xml b/alf/releng/targetplatform/org.eclipse.papyrus.incubation.alf.targetplatform/pom.xml
new file mode 100755
index 0000000..4582221
--- /dev/null
+++ b/alf/releng/targetplatform/org.eclipse.papyrus.incubation.alf.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.incubation.alf</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.alf.releng.targetplatforms</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>	
+	
+	<artifactId>org.eclipse.papyrus.incubation.alf.targetplatform</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	
+</project>
\ No newline at end of file

alf/releng/targetplatform/pom.xml

diff --git a/alf/releng/targetplatform/pom.xml b/alf/releng/targetplatform/pom.xml
new file mode 100755
index 0000000..7b77d22
--- /dev/null
+++ b/alf/releng/targetplatform/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.incubation.alf</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.alf.releng</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.alf.releng.targetplatforms</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.incubation.alf.targetplatform</module>
+	</modules>
+	
+</project>
\ No newline at end of file

alf/ui/org.eclipse.papyrus.uml.alf.preferences/pom.xml

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.preferences/pom.xml b/alf/ui/org.eclipse.papyrus.uml.alf.preferences/pom.xml
deleted file mode 100755
index e49759b..0000000
--- a/alf/ui/org.eclipse.papyrus.uml.alf.preferences/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.alf.ui</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.alf.preferences</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/pom.xml

diff --git a/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/pom.xml b/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/pom.xml
deleted file mode 100755
index 7843e76..0000000
--- a/alf/ui/org.eclipse.papyrus.uml.alf.properties.xtext/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.alf.ui</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.alf.properties.xtext</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

alf/ui/pom.xml

diff --git a/alf/ui/pom.xml b/alf/ui/pom.xml
deleted file mode 100755
index f42fd0a..0000000
--- a/alf/ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.alf.parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.alf.ui</artifactId>
-	<packaging>pom</packaging>
-	
-	<modules>
-		<module>org.eclipse.papyrus.uml.alf.preferences</module>
-		<module>org.eclipse.papyrus.uml.alf.properties.xtext</module>
-	</modules>	
-	
-</project>
\ No newline at end of file

diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/.project

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.feature/.project b/diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/.project
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.feature/.project
rename to diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/.project

diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/build.properties

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.feature/build.properties b/diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/build.properties
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.feature/build.properties
rename to diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/build.properties

diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/epl-v10.html

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.feature/epl-v10.html b/diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/epl-v10.html
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.feature/epl-v10.html
rename to diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/epl-v10.html

diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/feature.properties

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.feature/feature.properties b/diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/feature.properties
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.feature/feature.properties
rename to diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/feature.properties

diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/feature.xml

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.feature/feature.xml b/diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/feature.xml
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.feature/feature.xml
rename to diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/feature.xml

diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/license.html

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.feature/license.html b/diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/license.html
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.feature/license.html
rename to diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/license.html

diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/pom.xml

diff --git a/diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/pom.xml b/diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/pom.xml
new file mode 100644
index 0000000..d1a0704
--- /dev/null
+++ b/diagramtemplate/features/org.eclipse.papyrus.diagramtemplate.feature/pom.xml
@@ -0,0 +1,14 @@
+<?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.incubation.diagramtemplate</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.diagramtemplate.features</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.diagramtemplate.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+	
+</project>
\ No newline at end of file

diagramtemplate/features/pom.xml

diff --git a/diagramtemplate/features/pom.xml b/diagramtemplate/features/pom.xml
new file mode 100755
index 0000000..147f25d
--- /dev/null
+++ b/diagramtemplate/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.incubation.diagramtemplate</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.diagramtemplate.parent</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.diagramtemplate.features</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.diagramtemplate.feature</module>
+	</modules>	
+	
+</project>
\ No newline at end of file

diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/pom.xml

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/pom.xml b/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/pom.xml
deleted file mode 100755
index 3427c1a..0000000
--- a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.diagramtemplate.parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.diagramtemplate.doc</artifactId>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/pom.xml

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/pom.xml b/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/pom.xml
deleted file mode 100755
index 4fbd971..0000000
--- a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.diagramtemplate.parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.diagramtemplate.edit</artifactId>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/pom.xml

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/pom.xml b/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/pom.xml
deleted file mode 100755
index 9e775a0..0000000
--- a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.diagramtemplate.parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.diagramtemplate.editor</artifactId>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

diagramtemplate/org.eclipse.papyrus.diagramtemplate.feature/pom.xml

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.feature/pom.xml b/diagramtemplate/org.eclipse.papyrus.diagramtemplate.feature/pom.xml
deleted file mode 100644
index f173561..0000000
--- a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.feature/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.diagramtemplate.parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.diagramtemplate.feature</artifactId>
-	<packaging>eclipse-feature</packaging>
-</project>
\ No newline at end of file

diagramtemplate/org.eclipse.papyrus.diagramtemplate/pom.xml

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/pom.xml b/diagramtemplate/org.eclipse.papyrus.diagramtemplate/pom.xml
deleted file mode 100755
index 43ddd28..0000000
--- a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.diagramtemplate.parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.diagramtemplate</artifactId>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/.project

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/.project b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/.project
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/.project
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/.project

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/META-INF/MANIFEST.MF

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/META-INF/MANIFEST.MF b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/META-INF/MANIFEST.MF
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/META-INF/MANIFEST.MF
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/META-INF/MANIFEST.MF

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/OSGI-INF/l10n/bundle.properties

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/OSGI-INF/l10n/bundle.properties b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/OSGI-INF/l10n/bundle.properties
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/OSGI-INF/l10n/bundle.properties

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/about.html

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/about.html b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/about.html
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/about.html
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/about.html

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/build.properties

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/build.properties b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/build.properties
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/build.properties
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/build.properties

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/pom.xml

diff --git a/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/pom.xml b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/pom.xml
new file mode 100755
index 0000000..37dc71c
--- /dev/null
+++ b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/pom.xml
@@ -0,0 +1,14 @@
+<?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.incubation.diagramtemplate</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.diagramtemplate.plugins</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.diagramtemplate.doc</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	
+</project>
\ No newline at end of file

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/resources/template-diaGen.pdf

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/resources/template-diaGen.pdf b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/resources/template-diaGen.pdf
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/resources/template-diaGen.pdf
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/resources/template-diaGen.pdf
Binary files differ

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/resources/template-diaGen.pptx

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/resources/template-diaGen.pptx b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/resources/template-diaGen.pptx
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/resources/template-diaGen.pptx
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.doc/resources/template-diaGen.pptx
Binary files differ

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/.classpath

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/.classpath b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/.classpath
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/.classpath
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/.classpath

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/.project

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/.project b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/.project
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/.project
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/.project

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/.settings/org.eclipse.jdt.core.prefs

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/.settings/org.eclipse.jdt.core.prefs b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/.settings/org.eclipse.jdt.core.prefs
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/.settings/org.eclipse.jdt.core.prefs

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/.settings/org.eclipse.jdt.ui.prefs

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/.settings/org.eclipse.jdt.ui.prefs b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/.settings/org.eclipse.jdt.ui.prefs
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/.settings/org.eclipse.jdt.ui.prefs

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/META-INF/MANIFEST.MF

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/META-INF/MANIFEST.MF b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/META-INF/MANIFEST.MF
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/META-INF/MANIFEST.MF
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/META-INF/MANIFEST.MF

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/about.html

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/about.html b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/about.html
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/about.html
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/about.html

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/build.properties

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/build.properties b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/build.properties
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/build.properties
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/build.properties

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/plugin.properties

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/plugin.properties b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/plugin.properties
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/plugin.properties
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/plugin.properties

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/plugin.xml

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/plugin.xml b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/plugin.xml
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/plugin.xml
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/plugin.xml

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/pom.xml

diff --git a/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/pom.xml b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/pom.xml
new file mode 100755
index 0000000..1f90928
--- /dev/null
+++ b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/pom.xml
@@ -0,0 +1,14 @@
+<?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.incubation.diagramtemplate</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.diagramtemplate.plugins</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.diagramtemplate.edit</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	
+</project>
\ No newline at end of file

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/AbstractSelectionItemProvider.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/AbstractSelectionItemProvider.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/AbstractSelectionItemProvider.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/AbstractSelectionItemProvider.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/AbstractSelectionItemProvider.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/DiagramDefinitionItemProvider.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/DiagramDefinitionItemProvider.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/DiagramDefinitionItemProvider.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/DiagramDefinitionItemProvider.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/DiagramDefinitionItemProvider.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/DiagramTemplateEditPlugin.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/DiagramTemplateEditPlugin.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/DiagramTemplateEditPlugin.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/DiagramTemplateEditPlugin.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/DiagramTemplateEditPlugin.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/DiagramTemplateItemProviderAdapterFactory.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/DiagramTemplateItemProviderAdapterFactory.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/DiagramTemplateItemProviderAdapterFactory.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/DiagramTemplateItemProviderAdapterFactory.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/DiagramTemplateItemProviderAdapterFactory.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/SelectionItemProvider.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/SelectionItemProvider.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/SelectionItemProvider.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/SelectionItemProvider.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/SelectionItemProvider.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/SelectionRefItemProvider.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/SelectionRefItemProvider.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/SelectionRefItemProvider.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/SelectionRefItemProvider.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/SelectionRefItemProvider.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/TemplateItemProvider.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/TemplateItemProvider.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/TemplateItemProvider.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/TemplateItemProvider.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.edit/src/org/eclipse/papyrus/diagramtemplate/provider/TemplateItemProvider.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/.classpath

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/.classpath b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/.classpath
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/.classpath
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/.classpath

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/.project

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/.project b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/.project
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/.project
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/.project

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/.settings/org.eclipse.jdt.core.prefs

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/.settings/org.eclipse.jdt.core.prefs b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/.settings/org.eclipse.jdt.core.prefs
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/.settings/org.eclipse.jdt.core.prefs

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/.settings/org.eclipse.jdt.ui.prefs

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/.settings/org.eclipse.jdt.ui.prefs b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/.settings/org.eclipse.jdt.ui.prefs
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/.settings/org.eclipse.jdt.ui.prefs

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/META-INF/MANIFEST.MF

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/META-INF/MANIFEST.MF b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/META-INF/MANIFEST.MF
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/META-INF/MANIFEST.MF
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/META-INF/MANIFEST.MF

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/about.html

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/about.html b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/about.html
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/about.html
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/about.html

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/build.properties

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/build.properties b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/build.properties
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/build.properties
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/build.properties

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/DiagramTemplateModelFile.gif

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/DiagramTemplateModelFile.gif b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/DiagramTemplateModelFile.gif
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/DiagramTemplateModelFile.gif
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/DiagramTemplateModelFile.gif
Binary files differ

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/add.gif

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/add.gif b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/add.gif
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/add.gif
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/add.gif
Binary files differ

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/checked.gif

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/checked.gif b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/checked.gif
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/checked.gif
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/checked.gif
Binary files differ

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/copy.gif

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/copy.gif b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/copy.gif
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/copy.gif
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/copy.gif
Binary files differ

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/delete.gif

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/delete.gif b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/delete.gif
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/delete.gif
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/delete.gif
Binary files differ

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/down.gif

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/down.gif b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/down.gif
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/down.gif
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/down.gif
Binary files differ

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/execute.gif

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/execute.gif b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/execute.gif
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/execute.gif
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/execute.gif
Binary files differ

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/forAll.png

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/forAll.png b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/forAll.png
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/forAll.png
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/forAll.png
Binary files differ

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/forAllRef.png

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/forAllRef.png b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/forAllRef.png
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/forAllRef.png
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/forAllRef.png
Binary files differ

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/new.gif

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/new.gif b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/new.gif
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/new.gif
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/new.gif
Binary files differ

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/specific.gif

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/specific.gif b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/specific.gif
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/specific.gif
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/specific.gif
Binary files differ

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/specificRef.gif

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/specificRef.gif b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/specificRef.gif
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/specificRef.gif
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/specificRef.gif
Binary files differ

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/unchecked.gif

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/unchecked.gif b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/unchecked.gif
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/unchecked.gif
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/unchecked.gif
Binary files differ

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/up.gif

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/up.gif b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/up.gif
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/up.gif
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/obj16/up.gif
Binary files differ

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/wizban/NewDiagramTemplate.gif

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/wizban/NewDiagramTemplate.gif b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/wizban/NewDiagramTemplate.gif
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/icons/full/wizban/NewDiagramTemplate.gif
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/icons/full/wizban/NewDiagramTemplate.gif
Binary files differ

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/plugin.properties

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/plugin.properties b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/plugin.properties
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/plugin.properties
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/plugin.properties

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/plugin.xml

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/plugin.xml b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/plugin.xml
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/plugin.xml
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/plugin.xml

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/pom.xml

diff --git a/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/pom.xml b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/pom.xml
new file mode 100755
index 0000000..1bbdc5b
--- /dev/null
+++ b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/pom.xml
@@ -0,0 +1,14 @@
+<?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.incubation.diagramtemplate</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.diagramtemplate.plugins</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.diagramtemplate.editor</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	
+</project>
\ No newline at end of file

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/com/swtdesigner/ResourceManager.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/com/swtdesigner/ResourceManager.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/com/swtdesigner/ResourceManager.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/com/swtdesigner/ResourceManager.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/com/swtdesigner/ResourceManager.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/com/swtdesigner/SWTResourceManager.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/com/swtdesigner/SWTResourceManager.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/com/swtdesigner/SWTResourceManager.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/com/swtdesigner/SWTResourceManager.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/com/swtdesigner/SWTResourceManager.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateActionBarContributor.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateActionBarContributor.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateActionBarContributor.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateActionBarContributor.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateActionBarContributor.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateEditor.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateEditor.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateEditor.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateEditor.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateEditor.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateEditorPlugin.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateEditorPlugin.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateEditorPlugin.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateEditorPlugin.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateEditorPlugin.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateModelWizard.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateModelWizard.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateModelWizard.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateModelWizard.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateModelWizard.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramDefinitionContentProvider.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramDefinitionContentProvider.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramDefinitionContentProvider.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramDefinitionContentProvider.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramDefinitionContentProvider.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramDefinitionLabelProvider.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramDefinitionLabelProvider.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramDefinitionLabelProvider.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramDefinitionLabelProvider.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramDefinitionLabelProvider.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramKindContentProvider.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramKindContentProvider.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramKindContentProvider.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramKindContentProvider.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramKindContentProvider.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ElementsAvailableContentProvider.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ElementsAvailableContentProvider.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ElementsAvailableContentProvider.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ElementsAvailableContentProvider.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ElementsAvailableContentProvider.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ForContentProvider.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ForContentProvider.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ForContentProvider.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ForContentProvider.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ForContentProvider.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ForLabelProvider.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ForLabelProvider.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ForLabelProvider.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ForLabelProvider.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ForLabelProvider.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/TypesAvailableFromEReferenceContentProvider.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/TypesAvailableFromEReferenceContentProvider.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/TypesAvailableFromEReferenceContentProvider.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/TypesAvailableFromEReferenceContentProvider.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/TypesAvailableFromEReferenceContentProvider.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/TypesContentProvider.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/TypesContentProvider.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/TypesContentProvider.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/TypesContentProvider.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/TypesContentProvider.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/WhatContentProvider.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/WhatContentProvider.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/WhatContentProvider.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/WhatContentProvider.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/WhatContentProvider.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/launcher/DiagramTemplateLauncher.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/launcher/DiagramTemplateLauncher.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/launcher/DiagramTemplateLauncher.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/launcher/DiagramTemplateLauncher.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/launcher/DiagramTemplateLauncher.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/launcher/DiagramTemplateLauncherReport.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/launcher/DiagramTemplateLauncherReport.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/launcher/DiagramTemplateLauncherReport.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/launcher/DiagramTemplateLauncherReport.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/launcher/DiagramTemplateLauncherReport.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/utils/Messages.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/utils/Messages.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/utils/Messages.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/utils/Messages.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/utils/Messages.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/utils/messages.properties

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/utils/messages.properties b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/utils/messages.properties
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/utils/messages.properties
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/utils/messages.properties

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/.classpath

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/.classpath b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/.classpath
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/.classpath
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/.classpath

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/.project

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/.project b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/.project
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/.project
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/.project

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/.settings/org.eclipse.jdt.core.prefs

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/.settings/org.eclipse.jdt.core.prefs b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/.settings/org.eclipse.jdt.core.prefs
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/.settings/org.eclipse.jdt.core.prefs

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/.settings/org.eclipse.jdt.ui.prefs

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/.settings/org.eclipse.jdt.ui.prefs b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/.settings/org.eclipse.jdt.ui.prefs
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/.settings/org.eclipse.jdt.ui.prefs

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/META-INF/MANIFEST.MF

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/META-INF/MANIFEST.MF b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/META-INF/MANIFEST.MF
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/META-INF/MANIFEST.MF
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/META-INF/MANIFEST.MF

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/about.html

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/about.html b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/about.html
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/about.html
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/about.html

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/build.properties

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/build.properties b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/build.properties
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/build.properties
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/build.properties

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/model/diagramTemplate.ecore

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/model/diagramTemplate.ecore b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/model/diagramTemplate.ecore
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/model/diagramTemplate.ecore
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/model/diagramTemplate.ecore

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/model/diagramTemplate.genmodel

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/model/diagramTemplate.genmodel b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/model/diagramTemplate.genmodel
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/model/diagramTemplate.genmodel
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/model/diagramTemplate.genmodel

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/plugin.properties

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/plugin.properties b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/plugin.properties
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/plugin.properties
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/plugin.properties
Binary files differ

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/plugin.xml

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/plugin.xml b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/plugin.xml
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/plugin.xml
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/plugin.xml

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/pom.xml

diff --git a/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/pom.xml b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/pom.xml
new file mode 100755
index 0000000..baff576
--- /dev/null
+++ b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/pom.xml
@@ -0,0 +1,14 @@
+<?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.incubation.diagramtemplate</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.diagramtemplate.plugins</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.diagramtemplate</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	
+</project>
\ No newline at end of file

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/AbstractSelection.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/AbstractSelection.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/AbstractSelection.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/AbstractSelection.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/AbstractSelection.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/DiagramDefinition.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/DiagramDefinition.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/DiagramDefinition.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/DiagramDefinition.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/DiagramDefinition.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/DiagramTemplateFactory.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/DiagramTemplateFactory.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/DiagramTemplateFactory.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/DiagramTemplateFactory.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/DiagramTemplateFactory.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/DiagramTemplatePackage.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/DiagramTemplatePackage.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/DiagramTemplatePackage.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/DiagramTemplatePackage.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/DiagramTemplatePackage.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/Selection.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/Selection.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/Selection.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/Selection.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/Selection.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/SelectionKind.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/SelectionKind.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/SelectionKind.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/SelectionKind.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/SelectionKind.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/SelectionRef.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/SelectionRef.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/SelectionRef.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/SelectionRef.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/SelectionRef.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/Template.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/Template.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/Template.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/Template.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/Template.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/AbstractSelectionImpl.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/AbstractSelectionImpl.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/AbstractSelectionImpl.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/AbstractSelectionImpl.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/AbstractSelectionImpl.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/DiagramDefinitionImpl.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/DiagramDefinitionImpl.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/DiagramDefinitionImpl.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/DiagramDefinitionImpl.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/DiagramDefinitionImpl.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/DiagramTemplateFactoryImpl.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/DiagramTemplateFactoryImpl.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/DiagramTemplateFactoryImpl.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/DiagramTemplateFactoryImpl.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/DiagramTemplateFactoryImpl.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/DiagramTemplatePackageImpl.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/DiagramTemplatePackageImpl.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/DiagramTemplatePackageImpl.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/DiagramTemplatePackageImpl.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/DiagramTemplatePackageImpl.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/SelectionImpl.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/SelectionImpl.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/SelectionImpl.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/SelectionImpl.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/SelectionImpl.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/SelectionRefImpl.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/SelectionRefImpl.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/SelectionRefImpl.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/SelectionRefImpl.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/SelectionRefImpl.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/TemplateImpl.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/TemplateImpl.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/TemplateImpl.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/TemplateImpl.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/impl/TemplateImpl.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/util/DiagramTemplateAdapterFactory.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/util/DiagramTemplateAdapterFactory.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/util/DiagramTemplateAdapterFactory.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/util/DiagramTemplateAdapterFactory.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/util/DiagramTemplateAdapterFactory.java

diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/util/DiagramTemplateSwitch.java

diff --git a/diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/util/DiagramTemplateSwitch.java b/diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/util/DiagramTemplateSwitch.java
similarity index 100%
rename from diagramtemplate/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/util/DiagramTemplateSwitch.java
rename to diagramtemplate/plugins/org.eclipse.papyrus.diagramtemplate/src/org/eclipse/papyrus/diagramtemplate/util/DiagramTemplateSwitch.java

diagramtemplate/plugins/pom.xml

diff --git a/diagramtemplate/plugins/pom.xml b/diagramtemplate/plugins/pom.xml
new file mode 100755
index 0000000..1f34f0e
--- /dev/null
+++ b/diagramtemplate/plugins/pom.xml
@@ -0,0 +1,22 @@
+<?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.incubation.diagramtemplate</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.diagramtemplate.parent</artifactId>	
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.diagramtemplate.plugins</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.diagramtemplate</module>
+		<!--FIXME: Was already commented in the Papyrus  core build <module>org.eclipse.papyrus.diagramtemplate.doc</module> -->
+		<module>org.eclipse.papyrus.diagramtemplate.edit</module>
+		<module>org.eclipse.papyrus.diagramtemplate.editor</module>
+	</modules>	
+	
+</project>
\ No newline at end of file

diagramtemplate/pom.xml

diff --git a/diagramtemplate/pom.xml b/diagramtemplate/pom.xml
index 2574791..6646727 100755
--- a/diagramtemplate/pom.xml
+++ b/diagramtemplate/pom.xml
@@ -1,37 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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</groupId>
-		<artifactId>org.eclipse.papyrus.incubation</artifactId>		
-		<version>3.0.0-SNAPSHOT</version>
+		<groupId>org.eclipse.papyrus.incubation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.all</artifactId>		
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.papyrus.diagramtemplate.parent</artifactId>
+	
+	<groupId>org.eclipse.papyrus.incubation.diagramtemplate</groupId>
+	<artifactId>org.eclipse.papyrus.incubation.diagramtemplate.parent</artifactId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<modules>
-		<module>org.eclipse.papyrus.diagramtemplate</module>
-		<!--FIXME: Was already commented in the Papyrus  core build <module>org.eclipse.papyrus.diagramtemplate.doc</module> -->
-		<module>org.eclipse.papyrus.diagramtemplate.edit</module>
-		<module>org.eclipse.papyrus.diagramtemplate.editor</module>
-		<module>org.eclipse.papyrus.diagramtemplate.feature</module>
+	    <module>features</module>
+		<module>plugins</module>
 	</modules>	
 	
 	<profiles>
 		<profile>
-	      <id>diagramtemplate</id>	
-	     
-		  <properties>
-			<targetplatform.groupId>org.eclipse.papyrus</targetplatform.groupId>
-			<targetplatform.artifactId>org.eclipse.papyrus.incubation.diagramtemplate.targetplatform</targetplatform.artifactId>
-			<targetplatform.version>1.2.0-SNAPSHOT</targetplatform.version>
-		  </properties>
-	            
-	      <modules>
-	      	<module>releng</module>
-	      </modules>
-	    </profile>
+			<id>diagramtemplate</id>	
+			<properties>
+				<targetplatform.groupId>org.eclipse.papyrus.incubation.diagramtemplate</targetplatform.groupId>
+				<targetplatform.artifactId>org.eclipse.papyrus.incubation.diagramtemplate.targetplatform</targetplatform.artifactId>
+				<targetplatform.version>1.2.0-SNAPSHOT</targetplatform.version>
+			</properties>
+			
+			<modules>
+				<module>releng</module>
+			</modules>
+		</profile>
 	</profiles>
 	
 </project>
\ No newline at end of file

diagramtemplate/releng/org.eclipse.papyrus.incubation.diagramtemplate.p2/pom.xml

diff --git a/diagramtemplate/releng/org.eclipse.papyrus.incubation.diagramtemplate.p2/pom.xml b/diagramtemplate/releng/org.eclipse.papyrus.incubation.diagramtemplate.p2/pom.xml
index 1f81291..e322e6e 100755
--- a/diagramtemplate/releng/org.eclipse.papyrus.incubation.diagramtemplate.p2/pom.xml
+++ b/diagramtemplate/releng/org.eclipse.papyrus.incubation.diagramtemplate.p2/pom.xml
@@ -2,9 +2,10 @@
 <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</groupId>
-		<artifactId>org.eclipse.papyrus.diagramtemplate.releng</artifactId>		
+		<groupId>org.eclipse.papyrus.incubation.diagramtemplate</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.diagramtemplate.releng</artifactId>		
 		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 	

diagramtemplate/releng/pom.xml

diff --git a/diagramtemplate/releng/pom.xml b/diagramtemplate/releng/pom.xml
index 1529fe9..1093b47 100755
--- a/diagramtemplate/releng/pom.xml
+++ b/diagramtemplate/releng/pom.xml
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	
 	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.diagramtemplate.parent</artifactId>		
+		<groupId>org.eclipse.papyrus.incubation.diagramtemplate</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.diagramtemplate.parent</artifactId>		
 		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 	
-	<artifactId>org.eclipse.papyrus.diagramtemplate.releng</artifactId>
+	<artifactId>org.eclipse.papyrus.incubation.diagramtemplate.releng</artifactId>
 	<packaging>pom</packaging>
 	
 	<modules>

diagramtemplate/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform.target

diff --git a/diagramtemplate/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform.target b/diagramtemplate/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform.target
index 4fbb1a0..0d2cd14 100755
--- a/diagramtemplate/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform.target
+++ b/diagramtemplate/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Diagram Template - Oxygen" sequenceNumber="1498378130">
+<target name="Diagram Template - Oxygen" sequenceNumber="1504218131">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.core.runtime" version="0.0.0"/>
@@ -11,12 +11,18 @@
       <unit id="org.eclipse.emf.ecore.xmi" version="0.0.0"/>
       <unit id="org.eclipse.emf.edit.ui" version="0.0.0"/>
       <unit id="org.eclipse.ui.ide" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.runtime.diagram.ui.actions" version="0.0.0"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/releases/oxygen/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.uml.diagram.wizards" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.editor" version="0.0.0"/>
+      <repository id="Papyrus-Oxygen" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.uml2.uml" version="0.0.0"/>
       <unit id="org.eclipse.uml2.uml.edit" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.editor" version="0.0.0"/>
-      <unit id="org.eclipse.gmf.runtime.diagram.ui.actions" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.diagram.wizards" version="0.0.0"/>
-      <repository location="file:/home/data/httpd/download.eclipse.org/releases/oxygen/"/>
+      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.3"/>
     </location>
   </locations>
 </target>

diagramtemplate/releng/targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform.target

diff --git a/diagramtemplate/releng/targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform.target b/diagramtemplate/releng/targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform.target
index 71de2c7..1a37c21 100755
--- a/diagramtemplate/releng/targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform.target
+++ b/diagramtemplate/releng/targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Diagram Template - Oxygen" sequenceNumber="1498378130">
+<target name="Diagram Template - Oxygen" sequenceNumber="1504218131">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.core.runtime" version="0.0.0"/>
@@ -11,12 +11,18 @@
       <unit id="org.eclipse.emf.ecore.xmi" version="0.0.0"/>
       <unit id="org.eclipse.emf.edit.ui" version="0.0.0"/>
       <unit id="org.eclipse.ui.ide" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.runtime.diagram.ui.actions" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/releases/oxygen/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.uml.diagram.wizards" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.editor" version="0.0.0"/>
+      <repository id="Papyrus-Oxygen" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.uml2.uml" version="0.0.0"/>
       <unit id="org.eclipse.uml2.uml.edit" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.editor" version="0.0.0"/>
-      <unit id="org.eclipse.gmf.runtime.diagram.ui.actions" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.uml.diagram.wizards" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/releases/oxygen/"/>
+      <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.3"/>
     </location>
   </locations>
 </target>

diagramtemplate/releng/targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform.tpd

diff --git a/diagramtemplate/releng/targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform.tpd b/diagramtemplate/releng/targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform.tpd
index 1b0ed34..32fc125 100755
--- a/diagramtemplate/releng/targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform.tpd
+++ b/diagramtemplate/releng/targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform.tpd
@@ -8,10 +8,20 @@
  org.eclipse.emf.ecore.xmi lazy
  org.eclipse.emf.edit.ui lazy
  org.eclipse.ui.ide lazy
- org.eclipse.uml2.uml lazy
- org.eclipse.uml2.uml.edit lazy
- org.eclipse.papyrus.editor lazy
  org.eclipse.gmf.runtime.diagram.ui.actions lazy
- org.eclipse.papyrus.uml.diagram.wizards lazy
+ 
 }
 
+//manualUpdate
+location "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/" Papyrus-Oxygen {
+ org.eclipse.papyrus.uml.diagram.wizards lazy
+ org.eclipse.papyrus.editor lazy
+ 
+}
+
+//updateFrom("MDT UML2",0) 
+location uml "http://download.eclipse.org/modeling/mdt/uml2/updates/5.3" {
+ org.eclipse.uml2.uml lazy
+ org.eclipse.uml2.uml.edit lazy
+ 
+}
\ No newline at end of file

diagramtemplate/releng/targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform/pom.xml

diff --git a/diagramtemplate/releng/targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform/pom.xml b/diagramtemplate/releng/targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform/pom.xml
index 43e45b1..49e1bb0 100755
--- a/diagramtemplate/releng/targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform/pom.xml
+++ b/diagramtemplate/releng/targetplatform/org.eclipse.papyrus.incubation.diagramtemplate.targetplatform/pom.xml
@@ -1,9 +1,10 @@
 <?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</groupId>
-		<artifactId>org.eclipse.papyrus.diagramtemplate.releng.targetplatform</artifactId>		
+		<groupId>org.eclipse.papyrus.incubation.diagramtemplate</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.diagramtemplate.releng.targetplatform</artifactId>		
 		<version>1.2.0-SNAPSHOT</version>
 	</parent>	
 	

diagramtemplate/releng/targetplatform/pom.xml

diff --git a/diagramtemplate/releng/targetplatform/pom.xml b/diagramtemplate/releng/targetplatform/pom.xml
index a4f90f2..6a37796 100755
--- a/diagramtemplate/releng/targetplatform/pom.xml
+++ b/diagramtemplate/releng/targetplatform/pom.xml
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	
 	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.diagramtemplate.releng</artifactId>		
+		<groupId>org.eclipse.papyrus.incubation.diagramtemplate</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.diagramtemplate.releng</artifactId>		
 		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 	
-	<artifactId>org.eclipse.papyrus.diagramtemplate.releng.targetplatform</artifactId>
+	<artifactId>org.eclipse.papyrus.incubation.diagramtemplate.releng.targetplatform</artifactId>
 	<packaging>pom</packaging>
 	
 	<modules>

dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/.project

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.feature/.project b/dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/.project
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.feature/.project
rename to dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/.project

dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/build.properties

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.feature/build.properties b/dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/build.properties
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.feature/build.properties
rename to dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/build.properties

dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/epl-v10.html

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.feature/epl-v10.html b/dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/epl-v10.html
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.feature/epl-v10.html
rename to dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/epl-v10.html

dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/feature.properties

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.feature/feature.properties b/dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/feature.properties
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.feature/feature.properties
rename to dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/feature.properties

dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/feature.xml

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.feature/feature.xml b/dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/feature.xml
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.feature/feature.xml
rename to dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/feature.xml

dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/license.html

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.feature/license.html b/dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/license.html
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.feature/license.html
rename to dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/license.html

dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/pom.xml

diff --git a/dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/pom.xml b/dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/pom.xml
new file mode 100644
index 0000000..4e138b9
--- /dev/null
+++ b/dsml.validation/features/org.eclipse.papyrus.dsml.validation.feature/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.incubation.dsml.validation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.dsml.validation.features</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.dsml.validation.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+	
+</project>
\ No newline at end of file

dsml.validation/features/pom.xml

diff --git a/dsml.validation/features/pom.xml b/dsml.validation/features/pom.xml
new file mode 100755
index 0000000..884c0cc
--- /dev/null
+++ b/dsml.validation/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.incubation.dsml.validation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.dsml.validation.parent</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.dsml.validation.features</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.dsml.validation.feature</module>
+	</modules>	
+	
+</project>
\ No newline at end of file

dsml.validation/org.eclipse.papyrus.dsml.validation.feature/pom.xml

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.feature/pom.xml b/dsml.validation/org.eclipse.papyrus.dsml.validation.feature/pom.xml
deleted file mode 100644
index 795fd58..0000000
--- a/dsml.validation/org.eclipse.papyrus.dsml.validation.feature/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.dsml.validation.parent</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.dsml.validation.feature</artifactId>
-	<packaging>eclipse-feature</packaging>
-</project>
\ No newline at end of file

dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/pom.xml

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/pom.xml b/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/pom.xml
deleted file mode 100755
index 3e90aed..0000000
--- a/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.dsml.validation.parent</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.dsml.validation.model.ui</artifactId>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

dsml.validation/org.eclipse.papyrus.dsml.validation.model/pom.xml

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/pom.xml b/dsml.validation/org.eclipse.papyrus.dsml.validation.model/pom.xml
deleted file mode 100755
index 06201bd..0000000
--- a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.dsml.validation.parent</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.dsml.validation.model</artifactId>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

dsml.validation/org.eclipse.papyrus.dsml.validation.properties/pom.xml

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/pom.xml b/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/pom.xml
deleted file mode 100755
index b3dfe37..0000000
--- a/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.dsml.validation.parent</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.dsml.validation.properties</artifactId>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/pom.xml

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/pom.xml b/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/pom.xml
deleted file mode 100755
index 623cc81..0000000
--- a/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.dsml.validation.parent</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.dsml.validation.wizard</artifactId>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

dsml.validation/org.eclipse.papyrus.dsml.validation/pom.xml

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/pom.xml b/dsml.validation/org.eclipse.papyrus.dsml.validation/pom.xml
deleted file mode 100755
index 9422b5c..0000000
--- a/dsml.validation/org.eclipse.papyrus.dsml.validation/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.dsml.validation.parent</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.dsml.validation</artifactId>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/.classpath

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.classpath b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/.classpath
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.classpath
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/.classpath

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/.project

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.project b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/.project
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.project
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/.project

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.core.prefs

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.core.prefs b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.core.prefs
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.core.prefs

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.ui.prefs

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.ui.prefs b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.ui.prefs
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.ui.prefs

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/META-INF/MANIFEST.MF

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/META-INF/MANIFEST.MF b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/META-INF/MANIFEST.MF
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.generator/META-INF/MANIFEST.MF
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/META-INF/MANIFEST.MF

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/about.html

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/about.html b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/about.html
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.generator/about.html
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/about.html

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/build.properties

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/build.properties b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/build.properties
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.generator/build.properties
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/build.properties

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/plugin.properties

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/plugin.properties b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/plugin.properties
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.generator/plugin.properties
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/plugin.properties

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/pom.xml

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/pom.xml b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/pom.xml
similarity index 78%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.generator/pom.xml
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/pom.xml
index 030d06a..7eff8c4 100755
--- a/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/pom.xml
+++ b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/pom.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+	
 	<parent>
-		<artifactId>org.eclipse.papyrus.dsml.validation.parent</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
+		<groupId>org.eclipse.papyrus.incubation.dsml.validation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.dsml.validation.plugins</artifactId>
 		<version>1.2.0-SNAPSHOT</version>
 	</parent>
+	
 	<artifactId>org.eclipse.papyrus.dsml.validation.generator</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/Activator.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/Activator.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/Activator.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/Activator.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/Activator.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/ClientSelectorGen.xtend

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/ClientSelectorGen.xtend b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/ClientSelectorGen.xtend
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/ClientSelectorGen.xtend
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/ClientSelectorGen.xtend

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/ConstraintGen.xtend

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/ConstraintGen.xtend b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/ConstraintGen.xtend
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/ConstraintGen.xtend
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/ConstraintGen.xtend

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/Generate.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/Generate.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/Generate.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/Generate.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/Generate.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/tasks/generate.xml

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/tasks/generate.xml b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/tasks/generate.xml
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.generator/tasks/generate.xml
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/tasks/generate.xml

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/tasks/generateTarget.xml

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/tasks/generateTarget.xml b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/tasks/generateTarget.xml
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.generator/tasks/generateTarget.xml
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/tasks/generateTarget.xml

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/xtend-gen/.gitignore

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/xtend-gen/.gitignore b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/xtend-gen/.gitignore
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.generator/xtend-gen/.gitignore
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.generator/xtend-gen/.gitignore

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/.classpath

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.classpath b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/.classpath
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.classpath
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/.classpath

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/.project

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.project b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/.project
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.project
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/.project

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.core.prefs

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.core.prefs b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.core.prefs
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.core.prefs

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.ui.prefs

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.ui.prefs b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.ui.prefs
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.ui.prefs

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/about.html

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/about.html b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/about.html
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/about.html
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/about.html

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/build.properties

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/build.properties b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/build.properties
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/build.properties
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/build.properties

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/org.eclipse.papyrus.dsml.validation.model.ui.iml

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/org.eclipse.papyrus.dsml.validation.model.ui.iml b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/org.eclipse.papyrus.dsml.validation.model.ui.iml
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/org.eclipse.papyrus.dsml.validation.model.ui.iml
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/org.eclipse.papyrus.dsml.validation.model.ui.iml

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/plugin.properties

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/plugin.properties b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/plugin.properties
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/plugin.properties
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/plugin.properties

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/plugin.xml

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/plugin.xml b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/plugin.xml
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/plugin.xml
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/plugin.xml

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/pom.xml

diff --git a/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/pom.xml b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/pom.xml
new file mode 100755
index 0000000..3be47e9
--- /dev/null
+++ b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/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.incubation.dsml.validation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.dsml.validation.plugins</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.dsml.validation.model.ui</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	
+</project>
\ No newline at end of file

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Activator.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Activator.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Activator.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Activator.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Activator.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Messages.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Messages.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Messages.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Messages.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Messages.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/messages.properties

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/messages.properties b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/messages.properties
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/messages.properties
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/messages.properties

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/.classpath

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.classpath b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/.classpath
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/.classpath
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/.classpath

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/.project

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.project b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/.project
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/.project
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/.project

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.core.prefs

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.core.prefs b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.core.prefs
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.core.prefs

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.ui.prefs

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.ui.prefs b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.ui.prefs
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.ui.prefs

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/META-INF/MANIFEST.MF

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/META-INF/MANIFEST.MF b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/META-INF/MANIFEST.MF
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/META-INF/MANIFEST.MF
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/META-INF/MANIFEST.MF

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/about.html

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/about.html b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/about.html
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/about.html
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/about.html

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/build.properties

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/build.properties b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/build.properties
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/build.properties
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/build.properties

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/org.eclipse.papyrus.dsml.validation.model.iml

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/org.eclipse.papyrus.dsml.validation.model.iml b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/org.eclipse.papyrus.dsml.validation.model.iml
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/org.eclipse.papyrus.dsml.validation.model.iml
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/org.eclipse.papyrus.dsml.validation.model.iml

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/plugin.properties

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/plugin.properties b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/plugin.properties
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/plugin.properties
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/plugin.properties

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/pom.xml

diff --git a/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/pom.xml b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/pom.xml
new file mode 100755
index 0000000..90ff766
--- /dev/null
+++ b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/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.incubation.dsml.validation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.dsml.validation.plugins</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.dsml.validation.model</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	
+</project>
\ No newline at end of file

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/Activator.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/Activator.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/Activator.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/Activator.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/Activator.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/CategoryImpl.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/CategoryImpl.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/CategoryImpl.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/CategoryImpl.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/CategoryImpl.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintCategoryImpl.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintCategoryImpl.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintCategoryImpl.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintCategoryImpl.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintCategoryImpl.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintManagerImpl.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintManagerImpl.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintManagerImpl.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintManagerImpl.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintManagerImpl.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintProviderImpl.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintProviderImpl.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintProviderImpl.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintProviderImpl.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintProviderImpl.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ValidationRuleImpl.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ValidationRuleImpl.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ValidationRuleImpl.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ValidationRuleImpl.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ValidationRuleImpl.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/WrongStereotypeException.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/WrongStereotypeException.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/WrongStereotypeException.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/WrongStereotypeException.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/WrongStereotypeException.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Category.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Category.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Category.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Category.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Category.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintProvider.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintProvider.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintProvider.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintProvider.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintProvider.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintsCategory.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintsCategory.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintsCategory.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintsCategory.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintsCategory.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintsManager.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintsManager.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintsManager.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintsManager.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintsManager.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IValidationRule.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IValidationRule.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IValidationRule.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IValidationRule.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IValidationRule.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Mode.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Mode.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Mode.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Mode.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Mode.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Severity.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Severity.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Severity.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Severity.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Severity.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/profilenames/Utils.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/profilenames/Utils.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/profilenames/Utils.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/profilenames/Utils.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/profilenames/Utils.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/.classpath

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.classpath b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/.classpath
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.classpath
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/.classpath

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/.project

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.project b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/.project
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.project
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/.project

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.core.prefs

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.core.prefs b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.core.prefs
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.core.prefs

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.ui.prefs

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.ui.prefs b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.ui.prefs
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.ui.prefs

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/META-INF/MANIFEST.MF

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/META-INF/MANIFEST.MF b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/META-INF/MANIFEST.MF
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.properties/META-INF/MANIFEST.MF
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/META-INF/MANIFEST.MF

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/about.html

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/about.html b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/about.html
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.properties/about.html
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/about.html

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/build.properties

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/build.properties b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/build.properties
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.properties/build.properties
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/build.properties

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/customizationConfiguration.xmi

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/customizationConfiguration.xmi b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/customizationConfiguration.xmi
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.properties/customizationConfiguration.xmi
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/customizationConfiguration.xmi

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/org.eclipse.papyrus.dsml.validation.properties.iml

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/org.eclipse.papyrus.dsml.validation.properties.iml b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/org.eclipse.papyrus.dsml.validation.properties.iml
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.properties/org.eclipse.papyrus.dsml.validation.properties.iml
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/org.eclipse.papyrus.dsml.validation.properties.iml

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/plugin.properties

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/plugin.properties b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/plugin.properties
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.properties/plugin.properties
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/plugin.properties

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/plugin.xml

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/plugin.xml b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/plugin.xml
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.properties/plugin.xml
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/plugin.xml

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/pom.xml

diff --git a/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/pom.xml b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/pom.xml
new file mode 100755
index 0000000..18e1322
--- /dev/null
+++ b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/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.incubation.dsml.validation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.dsml.validation.plugins</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.dsml.validation.properties</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	
+</project>
\ No newline at end of file

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/dsmlvalidationproperties.ctx

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/dsmlvalidationproperties.ctx b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/dsmlvalidationproperties.ctx
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/dsmlvalidationproperties.ctx
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/dsmlvalidationproperties.ctx

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/ui/MultipleValidationRule.xwt

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/ui/MultipleValidationRule.xwt b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/ui/MultipleValidationRule.xwt
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/ui/MultipleValidationRule.xwt
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/ui/MultipleValidationRule.xwt

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/ui/SingleValidationRule.xwt

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/ui/SingleValidationRule.xwt b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/ui/SingleValidationRule.xwt
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/ui/SingleValidationRule.xwt
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/ui/SingleValidationRule.xwt

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/src/org/eclipse/papyrus/dsml/validation/properties/Activator.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/src/org/eclipse/papyrus/dsml/validation/properties/Activator.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/src/org/eclipse/papyrus/dsml/validation/properties/Activator.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.properties/src/org/eclipse/papyrus/dsml/validation/properties/Activator.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.properties/src/org/eclipse/papyrus/dsml/validation/properties/Activator.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/.classpath

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.classpath b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/.classpath
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.classpath
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/.classpath

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/.project

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.project b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/.project
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.project
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/.project

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.core.prefs

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.core.prefs b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.core.prefs
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.core.prefs

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.ui.prefs

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.ui.prefs b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.ui.prefs
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.ui.prefs

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.m2e.core.prefs

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.m2e.core.prefs b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.m2e.core.prefs
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.m2e.core.prefs

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/META-INF/MANIFEST.MF

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/META-INF/MANIFEST.MF b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/META-INF/MANIFEST.MF
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/META-INF/MANIFEST.MF
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/META-INF/MANIFEST.MF

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/about.html

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/about.html b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/about.html
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/about.html
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/about.html

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/build.properties

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/build.properties b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/build.properties
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/build.properties
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/build.properties

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/plugin.properties

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/plugin.properties b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/plugin.properties
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/plugin.properties
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/plugin.properties

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/pom.xml

diff --git a/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/pom.xml b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/pom.xml
new file mode 100755
index 0000000..bc20fcd
--- /dev/null
+++ b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/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.incubation.dsml.validation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.dsml.validation.plugins</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.dsml.validation.wizard</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	
+</project>
\ No newline at end of file

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/Activator.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/Activator.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/Activator.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/Activator.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/Activator.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ClassesGenerator.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ClassesGenerator.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ClassesGenerator.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ClassesGenerator.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ClassesGenerator.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/CreateEMFValidationProject.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/CreateEMFValidationProject.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/CreateEMFValidationProject.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/CreateEMFValidationProject.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/CreateEMFValidationProject.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/JavaContentGenerator.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/JavaContentGenerator.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/JavaContentGenerator.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/JavaContentGenerator.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/JavaContentGenerator.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationClassesGenerator.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationClassesGenerator.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationClassesGenerator.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationClassesGenerator.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationClassesGenerator.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/interfaces/IValidationPluginGenerator.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/interfaces/IValidationPluginGenerator.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/interfaces/IValidationPluginGenerator.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/interfaces/IValidationPluginGenerator.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/interfaces/IValidationPluginGenerator.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/.classpath

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/.classpath b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/.classpath
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/.classpath
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/.classpath

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/.project

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/.project b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/.project
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/.project
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/.project

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.core.prefs

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.core.prefs b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.core.prefs
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.core.prefs

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.ui.prefs

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.ui.prefs b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.ui.prefs
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.ui.prefs

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/META-INF/MANIFEST.MF

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/META-INF/MANIFEST.MF b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/META-INF/MANIFEST.MF
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/META-INF/MANIFEST.MF
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/META-INF/MANIFEST.MF

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/about.html

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/about.html b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/about.html
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/about.html
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/about.html

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/build.properties

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/build.properties b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/build.properties
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/build.properties
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/build.properties

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/plugin.properties

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.properties b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/plugin.properties
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.properties
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/plugin.properties

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/plugin.xml

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.xml b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/plugin.xml
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.xml
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/plugin.xml

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/pom.xml

diff --git a/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/pom.xml b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/pom.xml
new file mode 100755
index 0000000..c45837f
--- /dev/null
+++ b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/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.incubation.dsml.validation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.dsml.validation.plugins</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.dsml.validation</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	
+</project>
\ No newline at end of file

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/resource/PapyrusDSMLValidationRule.ecore

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusDSMLValidationRule.ecore b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/resource/PapyrusDSMLValidationRule.ecore
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusDSMLValidationRule.ecore
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/resource/PapyrusDSMLValidationRule.ecore

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.di

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.di b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.di
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.di
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.di

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.genmodel

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.genmodel b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.genmodel
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.genmodel
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.genmodel

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.notation

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.notation b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.notation
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.notation
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.notation

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.uml

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.uml b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.uml
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.uml
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.uml

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/MessageHandling.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/MessageHandling.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/MessageHandling.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/MessageHandling.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/MessageHandling.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/Mode.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/Mode.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/Mode.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/Mode.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/Mode.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/NameBasedMsgMode.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/NameBasedMsgMode.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/NameBasedMsgMode.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/NameBasedMsgMode.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/NameBasedMsgMode.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/PapyrusDSMLValidationRuleFactory.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/PapyrusDSMLValidationRuleFactory.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/PapyrusDSMLValidationRuleFactory.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/PapyrusDSMLValidationRuleFactory.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/PapyrusDSMLValidationRuleFactory.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/PapyrusDSMLValidationRulePackage.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/PapyrusDSMLValidationRulePackage.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/PapyrusDSMLValidationRulePackage.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/PapyrusDSMLValidationRulePackage.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/PapyrusDSMLValidationRulePackage.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/Severity.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/Severity.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/Severity.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/Severity.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/Severity.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/ValidationRule.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/ValidationRule.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/ValidationRule.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/ValidationRule.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/ValidationRule.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/MessageHandlingImpl.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/MessageHandlingImpl.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/MessageHandlingImpl.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/MessageHandlingImpl.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/MessageHandlingImpl.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/PapyrusDSMLValidationRuleFactoryImpl.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/PapyrusDSMLValidationRuleFactoryImpl.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/PapyrusDSMLValidationRuleFactoryImpl.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/PapyrusDSMLValidationRuleFactoryImpl.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/PapyrusDSMLValidationRuleFactoryImpl.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/PapyrusDSMLValidationRulePackageImpl.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/PapyrusDSMLValidationRulePackageImpl.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/PapyrusDSMLValidationRulePackageImpl.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/PapyrusDSMLValidationRulePackageImpl.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/PapyrusDSMLValidationRulePackageImpl.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/ValidationRuleImpl.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/ValidationRuleImpl.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/ValidationRuleImpl.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/ValidationRuleImpl.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/ValidationRuleImpl.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleAdapterFactory.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleAdapterFactory.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleAdapterFactory.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleAdapterFactory.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleAdapterFactory.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleResourceFactoryImpl.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleResourceFactoryImpl.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleResourceFactoryImpl.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleResourceFactoryImpl.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleResourceFactoryImpl.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleResourceImpl.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleResourceImpl.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleResourceImpl.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleResourceImpl.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleResourceImpl.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleSwitch.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleSwitch.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleSwitch.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleSwitch.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleSwitch.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleXMLProcessor.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleXMLProcessor.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleXMLProcessor.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleXMLProcessor.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleXMLProcessor.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src/org/eclipse/papyrus/dsml/validation/Activator.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/src/org/eclipse/papyrus/dsml/validation/Activator.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src/org/eclipse/papyrus/dsml/validation/Activator.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/src/org/eclipse/papyrus/dsml/validation/Activator.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src/org/eclipse/papyrus/dsml/validation/Activator.java

dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src/org/eclipse/papyrus/dsml/validation/IDSMLValidation.java

diff --git a/dsml.validation/org.eclipse.papyrus.dsml.validation/src/org/eclipse/papyrus/dsml/validation/IDSMLValidation.java b/dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src/org/eclipse/papyrus/dsml/validation/IDSMLValidation.java
similarity index 100%
rename from dsml.validation/org.eclipse.papyrus.dsml.validation/src/org/eclipse/papyrus/dsml/validation/IDSMLValidation.java
rename to dsml.validation/plugins/org.eclipse.papyrus.dsml.validation/src/org/eclipse/papyrus/dsml/validation/IDSMLValidation.java

dsml.validation/plugins/pom.xml

diff --git a/dsml.validation/plugins/pom.xml b/dsml.validation/plugins/pom.xml
new file mode 100755
index 0000000..225f95a
--- /dev/null
+++ b/dsml.validation/plugins/pom.xml
@@ -0,0 +1,24 @@
+<?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.incubation.dsml.validation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.dsml.validation.parent</artifactId>	
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.dsml.validation.plugins</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.dsml.validation</module>
+		<module>org.eclipse.papyrus.dsml.validation.generator</module>
+		<module>org.eclipse.papyrus.dsml.validation.model</module>
+		<module>org.eclipse.papyrus.dsml.validation.model.ui</module>
+		<module>org.eclipse.papyrus.dsml.validation.properties</module>
+		<module>org.eclipse.papyrus.dsml.validation.wizard</module>
+	</modules>	
+	
+</project>
\ No newline at end of file

dsml.validation/pom.xml

diff --git a/dsml.validation/pom.xml b/dsml.validation/pom.xml
index 3c9330a..0c1929e 100755
--- a/dsml.validation/pom.xml
+++ b/dsml.validation/pom.xml
@@ -3,23 +3,19 @@
 	<modelVersion>4.0.0</modelVersion>
 	
 	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.incubation</artifactId>		
-		<version>3.0.0-SNAPSHOT</version>
+		<groupId>org.eclipse.papyrus.incubation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.all</artifactId>		
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	
-	<artifactId>org.eclipse.papyrus.dsml.validation.parent</artifactId>
+	<groupId>org.eclipse.papyrus.incubation.dsml.validation</groupId>
+	<artifactId>org.eclipse.papyrus.incubation.dsml.validation.parent</artifactId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<modules>
-		<module>org.eclipse.papyrus.dsml.validation</module>
-		<module>org.eclipse.papyrus.dsml.validation.generator</module>
-		<module>org.eclipse.papyrus.dsml.validation.model</module>
-		<module>org.eclipse.papyrus.dsml.validation.model.ui</module>
-		<module>org.eclipse.papyrus.dsml.validation.properties</module>
-		<module>org.eclipse.papyrus.dsml.validation.wizard</module>
-		<module>org.eclipse.papyrus.dsml.validation.feature</module>
+		<module>features</module>
+		<module>plugins</module>
 	</modules>	
 	
 	<profiles>
@@ -27,7 +23,7 @@
 	      <id>dsml.validation</id>	
 	     
 		  <properties>
-			<targetplatform.groupId>org.eclipse.papyrus</targetplatform.groupId>
+			<targetplatform.groupId>org.eclipse.papyrus.incubation.dsml.validation</targetplatform.groupId>
 			<targetplatform.artifactId>org.eclipse.papyrus.incubation.dsml.validation.targetplatform</targetplatform.artifactId>
 			<targetplatform.version>1.2.0-SNAPSHOT</targetplatform.version>
 		  </properties>

dsml.validation/releng/org.eclipse.papyrus.incubation.dsml.validation.p2/pom.xml

diff --git a/dsml.validation/releng/org.eclipse.papyrus.incubation.dsml.validation.p2/pom.xml b/dsml.validation/releng/org.eclipse.papyrus.incubation.dsml.validation.p2/pom.xml
index 35f8f4d..5f91db9 100755
--- a/dsml.validation/releng/org.eclipse.papyrus.incubation.dsml.validation.p2/pom.xml
+++ b/dsml.validation/releng/org.eclipse.papyrus.incubation.dsml.validation.p2/pom.xml
@@ -2,9 +2,10 @@
 <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</groupId>
-		<artifactId>org.eclipse.papyrus.dsml.validation.releng</artifactId>		
+		<groupId>org.eclipse.papyrus.incubation.dsml.validation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.dsml.validation.releng</artifactId>		
 		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 	

dsml.validation/releng/pom.xml

diff --git a/dsml.validation/releng/pom.xml b/dsml.validation/releng/pom.xml
index 755f60a..6cee257 100755
--- a/dsml.validation/releng/pom.xml
+++ b/dsml.validation/releng/pom.xml
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	
 	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.dsml.validation.parent</artifactId>		
+		<groupId>org.eclipse.papyrus.incubation.dsml.validation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.dsml.validation.parent</artifactId>		
 		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 	
-	<artifactId>org.eclipse.papyrus.dsml.validation.releng</artifactId>
+	<artifactId>org.eclipse.papyrus.incubation.dsml.validation.releng</artifactId>
 	<packaging>pom</packaging>
 	
 	<modules>

dsml.validation/releng/targetplatform/org.eclipse.papyrus.incubation.dsml.validation.targetplatform/pom.xml

diff --git a/dsml.validation/releng/targetplatform/org.eclipse.papyrus.incubation.dsml.validation.targetplatform/pom.xml b/dsml.validation/releng/targetplatform/org.eclipse.papyrus.incubation.dsml.validation.targetplatform/pom.xml
index 3ac5896..5ec0052 100755
--- a/dsml.validation/releng/targetplatform/org.eclipse.papyrus.incubation.dsml.validation.targetplatform/pom.xml
+++ b/dsml.validation/releng/targetplatform/org.eclipse.papyrus.incubation.dsml.validation.targetplatform/pom.xml
@@ -1,9 +1,10 @@
 <?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</groupId>
-		<artifactId>org.eclipse.papyrus.dsml.validation.releng.targetplatform</artifactId>		
+		<groupId>org.eclipse.papyrus.incubation.dsml.validation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.dsml.validation.releng.targetplatform</artifactId>		
 		<version>1.2.0-SNAPSHOT</version>
 	</parent>	
 	

dsml.validation/releng/targetplatform/pom.xml

diff --git a/dsml.validation/releng/targetplatform/pom.xml b/dsml.validation/releng/targetplatform/pom.xml
index 7f8f6ff..f6b5ce0 100755
--- a/dsml.validation/releng/targetplatform/pom.xml
+++ b/dsml.validation/releng/targetplatform/pom.xml
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	
 	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.dsml.validation.releng</artifactId>		
+		<groupId>org.eclipse.papyrus.incubation.dsml.validation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.dsml.validation.releng</artifactId>		
 		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 	
-	<artifactId>org.eclipse.papyrus.dsml.validation.releng.targetplatform</artifactId>
+	<artifactId>org.eclipse.papyrus.incubation.dsml.validation.releng.targetplatform</artifactId>
 	<packaging>pom</packaging>
 	
 	<modules>

elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/.project

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.feature/.project b/elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/.project
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.feature/.project
rename to elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/.project

elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/build.properties

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.feature/build.properties b/elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/build.properties
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.feature/build.properties
rename to elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/build.properties

elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/epl-v10.html

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.feature/epl-v10.html b/elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/epl-v10.html
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.feature/epl-v10.html
rename to elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/epl-v10.html

elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/feature.properties

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.feature/feature.properties b/elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/feature.properties
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.feature/feature.properties
rename to elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/feature.properties

elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/feature.xml

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.feature/feature.xml b/elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/feature.xml
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.feature/feature.xml
rename to elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/feature.xml

elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/license.html

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.feature/license.html b/elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/license.html
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.feature/license.html
rename to elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/license.html

elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/pom.xml

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.feature/pom.xml b/elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/pom.xml
similarity index 77%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.feature/pom.xml
rename to elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/pom.xml
index f247a37..63ff244 100755
--- a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.feature/pom.xml
+++ b/elk/features/org.eclipse.papyrus.infra.gmfdiag.elk.feature/pom.xml
@@ -2,11 +2,14 @@
 <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</groupId>
-		<artifactId>org.eclipse.papyrus.infra.gmfdiag.elk.parent</artifactId>
+		<groupId>org.eclipse.papyrus.incubation.elk</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.elk.features</artifactId>
 		<version>0.1.0-SNAPSHOT</version>
 	</parent>
+
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.elk.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
+	
 </project>
\ No newline at end of file

elk/features/pom.xml

diff --git a/elk/features/pom.xml b/elk/features/pom.xml
new file mode 100755
index 0000000..d3dbacd
--- /dev/null
+++ b/elk/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.incubation.elk</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.elk.parent</artifactId>		
+		<version>0.1.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.elk.features</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.infra.gmfdiag.elk.feature</module>
+	</modules>	
+	
+</project>
\ No newline at end of file

elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/pom.xml

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/pom.xml b/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/pom.xml
deleted file mode 100755
index 8b5398f..0000000
--- a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.infra.gmfdiag.elk.parent</artifactId>
-		<version>0.1.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>org.eclipse.papyrus.infra.gmfdiag.elk.tests</artifactId>
-		<version>0.2.0-SNAPSHOT</version>
-  <packaging>eclipse-test-plugin</packaging>
-</project>

elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/.classpath

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk/.classpath b/elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/.classpath
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk/.classpath
rename to elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/.classpath

elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/.project

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk/.project b/elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/.project
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk/.project
rename to elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/.project

elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/.settings/org.eclipse.jdt.core.prefs

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk/.settings/org.eclipse.jdt.core.prefs b/elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk/.settings/org.eclipse.jdt.core.prefs
rename to elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/.settings/org.eclipse.jdt.core.prefs

elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/.settings/org.eclipse.jdt.ui.prefs

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk/.settings/org.eclipse.jdt.ui.prefs b/elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk/.settings/org.eclipse.jdt.ui.prefs
rename to elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/.settings/org.eclipse.jdt.ui.prefs

elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/.settings/org.eclipse.pde.api.tools.prefs

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk/.settings/org.eclipse.pde.api.tools.prefs b/elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk/.settings/org.eclipse.pde.api.tools.prefs
rename to elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/.settings/org.eclipse.pde.api.tools.prefs

elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/META-INF/MANIFEST.MF

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk/META-INF/MANIFEST.MF b/elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/META-INF/MANIFEST.MF
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk/META-INF/MANIFEST.MF
rename to elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/META-INF/MANIFEST.MF

elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/about.html

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk/about.html b/elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/about.html
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk/about.html
rename to elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/about.html

elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/build.properties

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk/build.properties b/elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/build.properties
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk/build.properties
rename to elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/build.properties

elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/plugin.properties

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk/plugin.properties b/elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/plugin.properties
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk/plugin.properties
rename to elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/plugin.properties

elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/plugin.xml

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk/plugin.xml b/elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/plugin.xml
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk/plugin.xml
rename to elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/plugin.xml

elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/pom.xml

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk/pom.xml b/elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/pom.xml
similarity index 77%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk/pom.xml
rename to elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/pom.xml
index ccd0449..e59a164 100755
--- a/elk/org.eclipse.papyrus.infra.gmfdiag.elk/pom.xml
+++ b/elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/pom.xml
@@ -2,11 +2,14 @@
 <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</groupId>
-		<artifactId>org.eclipse.papyrus.infra.gmfdiag.elk.parent</artifactId>
+		<groupId>org.eclipse.papyrus.incubation.elk</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.elk.plugins</artifactId>
 		<version>0.1.0-SNAPSHOT</version>
 	</parent>
+
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.elk</artifactId>
 	<packaging>eclipse-plugin</packaging>
+	
 </project>
\ No newline at end of file

elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/src/org/eclipse/papyrus/infra/gmfdiag/elk/Activator.java

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk/src/org/eclipse/papyrus/infra/gmfdiag/elk/Activator.java b/elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/src/org/eclipse/papyrus/infra/gmfdiag/elk/Activator.java
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk/src/org/eclipse/papyrus/infra/gmfdiag/elk/Activator.java
rename to elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/src/org/eclipse/papyrus/infra/gmfdiag/elk/Activator.java

elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/src/org/eclipse/papyrus/infra/gmfdiag/elk/PapyrusDiagramLayoutConnector.java

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk/src/org/eclipse/papyrus/infra/gmfdiag/elk/PapyrusDiagramLayoutConnector.java b/elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/src/org/eclipse/papyrus/infra/gmfdiag/elk/PapyrusDiagramLayoutConnector.java
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk/src/org/eclipse/papyrus/infra/gmfdiag/elk/PapyrusDiagramLayoutConnector.java
rename to elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/src/org/eclipse/papyrus/infra/gmfdiag/elk/PapyrusDiagramLayoutConnector.java

elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/src/org/eclipse/papyrus/infra/gmfdiag/elk/PapyrusLayoutSetup.java

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk/src/org/eclipse/papyrus/infra/gmfdiag/elk/PapyrusLayoutSetup.java b/elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/src/org/eclipse/papyrus/infra/gmfdiag/elk/PapyrusLayoutSetup.java
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk/src/org/eclipse/papyrus/infra/gmfdiag/elk/PapyrusLayoutSetup.java
rename to elk/plugins/org.eclipse.papyrus.infra.gmfdiag.elk/src/org/eclipse/papyrus/infra/gmfdiag/elk/PapyrusLayoutSetup.java

elk/plugins/pom.xml

diff --git a/elk/plugins/pom.xml b/elk/plugins/pom.xml
new file mode 100755
index 0000000..8cca4ea
--- /dev/null
+++ b/elk/plugins/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.incubation.elk</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.elk.parent</artifactId>	
+		<version>0.1.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.elk.plugins</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.infra.gmfdiag.elk</module>
+	</modules>	
+	
+</project>
\ No newline at end of file

elk/pom.xml

diff --git a/elk/pom.xml b/elk/pom.xml
index 2e434a8..edc1f55 100755
--- a/elk/pom.xml
+++ b/elk/pom.xml
@@ -1,19 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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</groupId>
-		<artifactId>org.eclipse.papyrus.incubation</artifactId>		
-		<version>3.0.0-SNAPSHOT</version>
+		<groupId>org.eclipse.papyrus.incubation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.all</artifactId>		
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.papyrus.infra.gmfdiag.elk.parent</artifactId>
+	
+	<groupId>org.eclipse.papyrus.incubation.elk</groupId>
+	<artifactId>org.eclipse.papyrus.incubation.elk.parent</artifactId>
 	<version>0.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<modules>
-		<module>org.eclipse.papyrus.infra.gmfdiag.elk</module>
-		<module>org.eclipse.papyrus.infra.gmfdiag.elk.tests</module>
-		<module>org.eclipse.papyrus.infra.gmfdiag.elk.feature</module>
+		<module>features</module>
+		<module>plugins</module>
+		<module>tests</module>
 	</modules>	
+		
+	<profiles>
+		<profile>
+	      <id>elk</id>	
+	     
+		  <properties>
+			<targetplatform.groupId>org.eclipse.papyrus.incubation.elk</targetplatform.groupId>
+			<targetplatform.artifactId>org.eclipse.papyrus.incubation.elk.targetplatform</targetplatform.artifactId>
+			<targetplatform.version>0.1.0-SNAPSHOT</targetplatform.version>
+		  </properties>
+	            
+	      <modules>
+	      	<module>releng</module>
+	      </modules>
+	    </profile>
+	</profiles>
 	
 </project>
\ No newline at end of file

elk/releng/org.eclipse.papyrus.incubation.elk.p2/.project

diff --git a/elk/releng/org.eclipse.papyrus.incubation.elk.p2/.project b/elk/releng/org.eclipse.papyrus.incubation.elk.p2/.project
new file mode 100755
index 0000000..0a79233
--- /dev/null
+++ b/elk/releng/org.eclipse.papyrus.incubation.elk.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>

elk/releng/org.eclipse.papyrus.incubation.elk.p2/category.xml

diff --git a/elk/releng/org.eclipse.papyrus.incubation.elk.p2/category.xml b/elk/releng/org.eclipse.papyrus.incubation.elk.p2/category.xml
new file mode 100755
index 0000000..50133cf
--- /dev/null
+++ b/elk/releng/org.eclipse.papyrus.incubation.elk.p2/category.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+  <feature url="features/org.eclipse.papyrus.infra.gmfdiag.elk.feature_0.1.0.qualifier.jar" id="org.eclipse.papyrus.infra.gmfdiag.elk.feature" version="0.1.0.qualifier">
+      <category name="org.eclipse.papyrus.incubation.category"/>
+   </feature>
+   <feature url="features/org.eclipse.papyrus.infra.gmfdiag.elk.feature.source_0.1.0.qualifier.jar" id="org.eclipse.papyrus.infra.gmfdiag.elk.feature.source" version="0.1.0.qualifier">
+      <category name="org.eclipse.papyrus.incubation.category"/>
+   </feature>
+  
+  <category-def name="org.eclipse.papyrus.incubation.category" label="Papyrus Incubation">
+      <description>
+         Papyrus Incubation features
+      </description>
+   </category-def>
+</site>

elk/releng/org.eclipse.papyrus.incubation.elk.p2/pom.xml

diff --git a/elk/releng/org.eclipse.papyrus.incubation.elk.p2/pom.xml b/elk/releng/org.eclipse.papyrus.incubation.elk.p2/pom.xml
new file mode 100755
index 0000000..01c7baf
--- /dev/null
+++ b/elk/releng/org.eclipse.papyrus.incubation.elk.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.incubation.elk</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.elk.releng</artifactId>		
+		<version>0.1.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.elk.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

elk/releng/pom.xml

diff --git a/elk/releng/pom.xml b/elk/releng/pom.xml
new file mode 100755
index 0000000..ba16c68
--- /dev/null
+++ b/elk/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.incubation.elk</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.elk.parent</artifactId>		
+		<version>0.1.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.elk.releng</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>targetplatform</module>
+		<module>org.eclipse.papyrus.incubation.elk.p2</module>
+	</modules>	
+	
+</project>
\ No newline at end of file

elk/releng/promote/dsmlvalidation.sh

diff --git a/elk/releng/promote/dsmlvalidation.sh b/elk/releng/promote/dsmlvalidation.sh
new file mode 100755
index 0000000..360a908
--- /dev/null
+++ b/elk/releng/promote/dsmlvalidation.sh
@@ -0,0 +1,258 @@
+#Based upon Gef4 publish.sh script
+
+#causes the shell to exit if any subcommand or pipeline returns a non-zero status.
+#set -e
+
+# Script may take 5-6 command line parameters:
+# $1: Hudson job name: <name>
+# $2: Hudson build id: <id>
+# $3: Build type: i(ntegration), s(table), r(elease)
+# $4: The release label used to label the drop files, e.g. 3.10.0 or 3.10.1
+# $5: The eclipse target version, e.g. mars or neon
+# $6: Override if exists
+# $7: An optional release label suffix to be appended to drop files name, e.g. M1, RC1 
+
+##Additional variables to specify for each project
+
+#The root url that enables to find the job with ${hudsonJobRootUrl}/$jobName/$buildNumber
+hudsonJobRootUrl="https://hudson.eclipse.org/papyrus/job"
+
+#The name of the tool
+repo="incubation"
+subRepo="elk"
+updates="updates"
+drops="downloads/drops"
+
+#The specific localization
+remoteRoot="/home/data/httpd/download.eclipse.org"
+papyrusRoot="modeling/mdt/papyrus"
+remoteUpdateSiteRoot=${remoteRoot}/${papyrusRoot}/${repo}
+remoteUpdateSite=${remoteUpdateSiteRoot}/${subRepo}
+remoteUpdateSiteDir=${remoteUpdateSite}/${updates}
+echo "remoteUpdateSiteDir: $remoteUpdateSiteDir"
+
+#The localization of the local build target
+targetResults="archive/${subRepo}/releng/org.eclipse.papyrus.${repo}.${subRepo}.p2/target/repository"
+echo "targetResults: $targetResults"
+
+#The rcpPrompote.sh script may be used to publish the Incubation build results. 
+#if [ $# -eq 6 -o $# -eq 7  ];
+#then
+#	jobName=$1
+jobName="Papyrus-Incubation-DsmlValidation"
+	echo "jobName: $jobName"
+#	buildNumber=$2
+buildNumber="4"
+	echo "buildNumber: $buildNumber"
+#	releaseType=$3
+releaseType="i"
+	echo "releaseType: $releaseType"
+#	releaseLabel=$4	
+releaseLabel="1.2.0"
+	echo "releaseLabel: $releaseLabel"
+#	eclipseTarget=$5
+eclipseTarget="oxygen"	
+	echo "eclipseTarget: $eclipseTarget"
+#	override=$6	
+override="y"
+	echo "override: $override"
+
+	if [ -n "$7" ];
+	then
+		releaseLabelSuffix=$7
+		echo "releaseLabelSuffix: $releaseLabelSuffix"
+	fi
+#else
+#	echo "Missing so parameters: command jobName buildNumber releaseType releaseLabel eclipseTarget override [releaseLabelSuffix]"
+#	exit 1;
+#fi
+
+###########jobName parameter###########
+if [ -z "$jobName" ];
+then
+	echo "The Hudson job you want to promote must be specified"
+	exit 1
+fi
+
+###########buildNumber parameter###########
+if [ -z "$buildNumber" ];
+then
+	echo "The id of the $jobName build you want to promote must be specified"
+	exit 1
+fi
+
+###########releaseType parameter###########
+if [ -z "$releaseType" ];
+then
+    echo "The type of build you want to publish to [i(integration), s(table), r(elease)]."
+    exit;
+fi
+echo "Publishing as $releaseType build"
+
+###########releaseLabel parameter###########
+if [ -z "$releaseLabel" ];
+then
+    echo "The release label (e.g. 3.10.0, 3.10.1M2) must be specified."
+    exit 1
+fi
+echo "Release label: $releaseLabel"
+
+###########eclipseTarget parameter###########
+if [ -z "$eclipseTarget" ];
+then
+    echo "The Eclipse target (e.g. mars, neon) must be specified."
+    exit 1
+fi
+echo "Eclipse target : $eclipseTarget"
+
+###########Override parameter###########
+if [ "$override" != y -a "$override" != n ];
+then
+	echo "Parameter override has to 'y'(es) or 'n'(o) but was: $override"
+    exit 0
+fi
+
+if [ "$override" == "y" ];
+then
+	echo "Will override the previous artifacts if found"
+else
+	echo "Will not override the previous arifacts if found"
+fi
+
+########### Compute local build results using buildNumber ###########
+if [ "$buildNumber" = "lastStable" -o "$buildNumber" = "lastSuccessful" ];
+then
+	# Reverse lookup the build id (in case lastSuccessful or lastStable was used)
+	for i in $(find ~/.hudson/jobs/$jobName/builds/ -type l)
+	do
+		if [ "$(readlink -f $i)" = "$(readlink -f ~/.hudson/jobs/$jobName/$buildNumber)" ];
+		then
+			buildNumber=${i##*/}
+		fi
+	done
+	echo "Reverse lookup (lastStable/lastSuccessful) yielded buildNumber: $buildNumber"
+fi
+
+echo "~/.hudson/jobs/${jobName}/builds/${buildNumber}"
+jobDir=$(readlink -f ~/.hudson/jobs/${jobName}/builds/${buildNumber})
+if ! [ -d $jobDir ];
+then
+	echo "The specified buildNumber does not refer to an existing build: $buildNumber"
+	exit 1
+fi
+
+localResults=${jobDir}/${targetResults}
+echo "localResults: ${localResults}"
+
+########### Promote Job ###########
+destination=$remoteUpdateSiteDir/$eclipseTarget/${releaseLabel}${releaseLabelSuffix}
+echo "Destination: $destination"
+
+if [ "$override" == "n" ];
+then
+	if [ -d $destination ];
+	then
+		if [ "$(ls -A ${destination})" ];
+		then
+			echo "The destination is not empty. You may consider overriding or archiving"
+			exit 1
+		fi
+	fi
+fi
+
+if [ "$override" == "y" ];
+then
+	if [ -d $destination ];
+	then
+		echo "Overriding the RCP by cleaning the $destination folder"
+		rm -rf ${destination}/*
+	fi
+fi
+
+#Go to the artifact directory
+cd $localResults
+echo "Promoting the Job to $destination"
+#No error if exists, makes parent directories as needed
+mkdir -p $destination
+
+#Copy the contents onto the temp folder and change the permissions
+cp -R * $destination
+
+
+########### Update composites ###########
+# TODO update composite root ./eclipseTarget/* and parent ./*
+echo "Update Composites"
+timestamp=$(date +%s000)
+
+# This function indents the text with two white spaces
+indent() {
+sed 's/^/  /';
+}
+
+# This function is used to generate the composites
+function updateComposites() {
+cat > "compositeArtifacts.xml" <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<repository name="Papyrus" type="org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository" version="1.0.0">
+  <properties size="1">
+    <property name="p2.timestamp" value="$1"/>
+  </properties>
+  <children size="$2">
+$(	
+for file in *; do 
+if [ -d $file ]; then 
+    printf "<child location='${file}'/>" | indent | indent
+fi
+done
+)
+  </children>
+</repository>
+EOF
+
+cat > "compositeContent.xml" <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<repository name="Papyrus" type="org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" version="1.0.0">
+  <properties size="1">
+    <property name="p2.timestamp" value="$1"/>
+  </properties>
+  <children size="$2">
+$(	
+for file in *; do 
+if [ -d $file ]; then 
+    printf "<child location='${file}'/>" | indent | indent
+fi
+done
+)
+  </children>
+</repository>
+EOF
+}
+
+echo "Update root composites: $remoteUpdateSite"
+cd $remoteUpdateSite
+childrenCount=$(find . -maxdepth 1 -type d  \( ! -iname ".*" \) | wc -l)
+updateComposites $timestamp $childrenCount
+
+echo "Update eclipseTarget composites: $remoteUpdateSiteDir"
+cd $remoteUpdateSiteDir
+childrenCount=$(find . -maxdepth 1 -type d  \( ! -iname ".*" \) | wc -l)
+updateComposites $timestamp $childrenCount
+
+echo "Update releaseLabel composites: $remoteUpdateSiteDir/$eclipseTarget"
+cd $remoteUpdateSiteDir/$eclipseTarget
+childrenCount=$(find . -maxdepth 1 -type d  \( ! -iname ".*" \) | wc -l)
+updateComposites $timestamp $childrenCount
+
+
+########### Set Access Rights ###########
+
+# This function sets the acess rights to allow all memebers of the group to edit the files
+function setAccessRights() {
+	chmod -R 775 "$1"
+	chgrp -hR modeling.mdt.papyrus "$1"
+}
+echo "Set access right -R: $remoteUpdateSiteDir"
+setAccessRights $remoteUpdateSiteDir
+
+
+echo "publishing done."
\ No newline at end of file

elk/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.elk.targetplatform.target

diff --git a/elk/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.elk.targetplatform.target b/elk/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.elk.targetplatform.target
new file mode 100755
index 0000000..718b39a
--- /dev/null
+++ b/elk/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.elk.targetplatform.target
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="ELK - Oxygen" sequenceNumber="1504254872">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ui" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>
+      <unit id="org.eclipse.xtend.lib" version="0.0.0"/>
+      <unit id="org.eclipse.xtend" version="0.0.0"/>
+      <unit id="org.eclipse.emf.mwe2.lib" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.codegen.ecore" version="0.0.0"/>
+      <unit id="org.eclipse.emf" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.uml.resources" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.launcher" version="0.0.0"/>
+      <unit id="org.eclipse.ui.ide.application" version="0.0.0"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/releases/oxygen/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.infra.core" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.infra.gmfdiag.common" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.editor" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.diagram.clazz" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.infra.gmfdiag.export" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.views.modelexplorer" version="0.0.0"/>
+      <repository id="Papyrus-Oxygen" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.junit.framework" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.junit.utils" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.tests.framework" version="0.0.0"/>
+      <repository id="Papyrus-Oxygen-Developer" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.elk.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.elk.ui.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.elk.gmf.feature.feature.group" version="0.0.0"/>
+      <repository id="elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="0.0.0"/>
+      <repository id="gmfTooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.upr.utp" version="0.0.0"/>
+      <repository id="upr" location="file:/home/data/httpd/download.eclipse.org/upr/0.9RC1/update/"/>
+    </location>
+  </locations>
+</target>

elk/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/.project

diff --git a/elk/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/.project b/elk/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/.project
new file mode 100755
index 0000000..7477ea0
--- /dev/null
+++ b/elk/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.incubation.targetplatform.oxygen</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

elk/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform.target

diff --git a/elk/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform.target b/elk/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform.target
new file mode 100755
index 0000000..91d7abe
--- /dev/null
+++ b/elk/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform.target
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="ELK - Oxygen" sequenceNumber="1504254872">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ui" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>
+      <unit id="org.eclipse.xtend.lib" version="0.0.0"/>
+      <unit id="org.eclipse.xtend" version="0.0.0"/>
+      <unit id="org.eclipse.emf.mwe2.lib" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.codegen.ecore" version="0.0.0"/>
+      <unit id="org.eclipse.emf" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.uml.resources" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.launcher" version="0.0.0"/>
+      <unit id="org.eclipse.ui.ide.application" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/releases/oxygen/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.infra.core" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.infra.gmfdiag.common" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.editor" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.diagram.clazz" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.infra.gmfdiag.export" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.views.modelexplorer" version="0.0.0"/>
+      <repository id="Papyrus-Oxygen" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.junit.framework" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.junit.utils" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.tests.framework" version="0.0.0"/>
+      <repository id="Papyrus-Oxygen-Developer" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.elk.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.elk.ui.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.elk.gmf.feature.feature.group" version="0.0.0"/>
+      <repository id="elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="0.0.0"/>
+      <repository id="gmfTooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.upr.utp" version="0.0.0"/>
+      <repository id="upr" location="http://download.eclipse.org/upr/0.9RC1/update/"/>
+    </location>
+  </locations>
+</target>

elk/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform.tpd

diff --git a/elk/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform.tpd b/elk/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform.tpd
new file mode 100755
index 0000000..c095b72
--- /dev/null
+++ b/elk/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform.tpd
@@ -0,0 +1,50 @@
+target "ELK - Oxygen" with source requirements
+
+location "http://download.eclipse.org/releases/oxygen/" {
+ org.eclipse.ui lazy
+ org.eclipse.gmf.runtime.diagram.ui lazy
+ org.eclipse.xtend.lib lazy
+ org.eclipse.xtend lazy
+ org.eclipse.emf.mwe2.lib lazy
+ org.eclipse.uml2.codegen.ecore lazy
+ org.eclipse.emf lazy
+ org.eclipse.uml2.uml.resources lazy
+ org.eclipse.equinox.launcher lazy
+ org.eclipse.ui.ide.application lazy
+}
+
+//manualUpdate
+location "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/" Papyrus-Oxygen {
+ org.eclipse.papyrus.infra.core lazy
+ org.eclipse.papyrus.infra.gmfdiag.common lazy
+ org.eclipse.papyrus.editor lazy
+ org.eclipse.papyrus.uml.diagram.clazz lazy
+ org.eclipse.papyrus.infra.gmfdiag.export lazy
+ org.eclipse.papyrus.views.modelexplorer lazy
+ 
+}
+
+//manualUpdate
+location "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/" Papyrus-Oxygen-Developer {
+ org.eclipse.papyrus.junit.framework lazy
+ org.eclipse.papyrus.junit.utils lazy
+ org.eclipse.papyrus.tests.framework lazy
+ 
+}
+
+// required by ELK integration
+location elk "http://download.eclipse.org/elk/updates/releases/0.1.0/" {
+ org.eclipse.elk.feature.feature.group lazy
+ org.eclipse.elk.ui.feature.feature.group lazy
+ org.eclipse.elk.gmf.feature.feature.group lazy
+}
+
+location gmfTooling "http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a" {
+ org.eclipse.gmf.tooling.codegen.xtend2.feature.group lazy
+ org.eclipse.gmf.tooling.runtime.feature.group lazy
+} 
+
+location upr "http://download.eclipse.org/upr/0.9RC1/update/" {
+ org.eclipse.upr.utp lazy
+	
+}
\ No newline at end of file

elk/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/pom.xml

diff --git a/elk/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/pom.xml b/elk/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/pom.xml
new file mode 100755
index 0000000..a51e350
--- /dev/null
+++ b/elk/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/pom.xml
@@ -0,0 +1,14 @@
+<?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.incubation.elk</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.elk.releng.targetplatform</artifactId>		
+		<version>0.1.0-SNAPSHOT</version>
+	</parent>	
+	
+	<artifactId>org.eclipse.papyrus.incubation.elk.targetplatform</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	
+</project>
\ No newline at end of file

elk/releng/targetplatform/pom.xml

diff --git a/elk/releng/targetplatform/pom.xml b/elk/releng/targetplatform/pom.xml
new file mode 100755
index 0000000..81e0f6c
--- /dev/null
+++ b/elk/releng/targetplatform/pom.xml
@@ -0,0 +1,18 @@
+<?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.incubation.elk</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.elk.releng</artifactId>		
+		<version>0.1.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.elk.releng.targetplatform</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.incubation.elk.targetplatform</module>
+	</modules>
+	
+</project>
\ No newline at end of file

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.classpath

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.classpath b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.classpath
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.classpath
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.classpath

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.project

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.project b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.project
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.project
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.project

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.core.resources.prefs

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.core.resources.prefs b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.core.resources.prefs
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.core.resources.prefs

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.core.runtime.prefs

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.core.runtime.prefs b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.core.runtime.prefs
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.core.runtime.prefs

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.jdt.core.prefs

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.jdt.core.prefs b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.jdt.core.prefs
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.jdt.core.prefs

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.jdt.ui.prefs

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.jdt.ui.prefs b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.jdt.ui.prefs
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.jdt.ui.prefs

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.pde.api.tools.prefs

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.pde.api.tools.prefs b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.pde.api.tools.prefs
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/.settings/org.eclipse.pde.api.tools.prefs

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/META-INF/MANIFEST.MF

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/META-INF/MANIFEST.MF b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/META-INF/MANIFEST.MF
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/META-INF/MANIFEST.MF

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/about.html

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/about.html b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/about.html
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/about.html
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/about.html

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/build.properties

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/build.properties b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/build.properties
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/build.properties
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/build.properties

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/pom.xml

diff --git a/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/pom.xml b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/pom.xml
new file mode 100755
index 0000000..4575ecc
--- /dev/null
+++ b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  	<modelVersion>4.0.0</modelVersion>
+
+  	<parent>
+		<groupId>org.eclipse.papyrus.incubation.elk</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.elk.tests</artifactId>
+		<version>0.1.0-SNAPSHOT</version>
+  	</parent>
+  
+  	<artifactId>org.eclipse.papyrus.infra.gmfdiag.elk.tests</artifactId>
+	<version>0.2.0-SNAPSHOT</version>
+  	<packaging>eclipse-test-plugin</packaging>
+  
+</project>

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/expected/Advanced-expected.svg

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/expected/Advanced-expected.svg b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/expected/Advanced-expected.svg
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/expected/Advanced-expected.svg
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/expected/Advanced-expected.svg

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/expected/Basic-expected.svg

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/expected/Basic-expected.svg b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/expected/Basic-expected.svg
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/expected/Basic-expected.svg
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/expected/Basic-expected.svg

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/initial/Advanced-initial.svg

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/initial/Advanced-initial.svg b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/initial/Advanced-initial.svg
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/initial/Advanced-initial.svg
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/initial/Advanced-initial.svg

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/initial/Basic-initial.svg

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/initial/Basic-initial.svg b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/initial/Basic-initial.svg
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/initial/Basic-initial.svg
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/initial/Basic-initial.svg

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/model.di

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/model.di b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/model.di
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/model.di
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/model.di

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/model.notation

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/model.notation b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/model.notation
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/model.notation
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/model.notation

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/model.uml

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/model.uml b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/model.uml
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/model.uml
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-classdiag/model.uml

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/expected/Basic-expected.SVG

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/expected/Basic-expected.SVG b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/expected/Basic-expected.SVG
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/expected/Basic-expected.SVG
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/expected/Basic-expected.SVG

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/initial/Advanced-initial.svg

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/initial/Advanced-initial.svg b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/initial/Advanced-initial.svg
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/initial/Advanced-initial.svg
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/initial/Advanced-initial.svg

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/initial/Basic-initial.SVG

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/initial/Basic-initial.SVG b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/initial/Basic-initial.SVG
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/initial/Basic-initial.SVG
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/initial/Basic-initial.SVG

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/model.di

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/model.di b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/model.di
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/model.di
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/model.di

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/model.notation

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/model.notation b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/model.notation
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/model.notation
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/model.notation

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/model.uml

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/model.uml b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/model.uml
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/model.uml
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/resource/simple-seqdiag/model.uml

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/src/org/eclipse/papyrus/infra/gmfdiag/elk/tests/AllTests.java

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/src/org/eclipse/papyrus/infra/gmfdiag/elk/tests/AllTests.java b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/src/org/eclipse/papyrus/infra/gmfdiag/elk/tests/AllTests.java
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/src/org/eclipse/papyrus/infra/gmfdiag/elk/tests/AllTests.java
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/src/org/eclipse/papyrus/infra/gmfdiag/elk/tests/AllTests.java

elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/src/org/eclipse/papyrus/infra/gmfdiag/elk/tests/classdiag/ClassDiagramLayoutTests.java

diff --git a/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/src/org/eclipse/papyrus/infra/gmfdiag/elk/tests/classdiag/ClassDiagramLayoutTests.java b/elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/src/org/eclipse/papyrus/infra/gmfdiag/elk/tests/classdiag/ClassDiagramLayoutTests.java
similarity index 100%
rename from elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/src/org/eclipse/papyrus/infra/gmfdiag/elk/tests/classdiag/ClassDiagramLayoutTests.java
rename to elk/tests/org.eclipse.papyrus.infra.gmfdiag.elk.tests/src/org/eclipse/papyrus/infra/gmfdiag/elk/tests/classdiag/ClassDiagramLayoutTests.java

elk/tests/pom.xml

diff --git a/elk/tests/pom.xml b/elk/tests/pom.xml
new file mode 100755
index 0000000..81d840a
--- /dev/null
+++ b/elk/tests/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.incubation.elk</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.elk.parent</artifactId>	
+		<version>0.1.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.elk.tests</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.infra.gmfdiag.elk.tests</module>
+	</modules>	
+	
+</project>
\ No newline at end of file

layers/features/org.eclipse.papyrus.layers.feature/.project

diff --git a/layers/org.eclipse.papyrus.layers.feature/.project b/layers/features/org.eclipse.papyrus.layers.feature/.project
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.feature/.project
rename to layers/features/org.eclipse.papyrus.layers.feature/.project

layers/features/org.eclipse.papyrus.layers.feature/build.properties

diff --git a/layers/org.eclipse.papyrus.layers.feature/build.properties b/layers/features/org.eclipse.papyrus.layers.feature/build.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.feature/build.properties
rename to layers/features/org.eclipse.papyrus.layers.feature/build.properties

layers/features/org.eclipse.papyrus.layers.feature/epl-v10.html

diff --git a/layers/org.eclipse.papyrus.layers.feature/epl-v10.html b/layers/features/org.eclipse.papyrus.layers.feature/epl-v10.html
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.feature/epl-v10.html
rename to layers/features/org.eclipse.papyrus.layers.feature/epl-v10.html

layers/features/org.eclipse.papyrus.layers.feature/feature.properties

diff --git a/layers/org.eclipse.papyrus.layers.feature/feature.properties b/layers/features/org.eclipse.papyrus.layers.feature/feature.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.feature/feature.properties
rename to layers/features/org.eclipse.papyrus.layers.feature/feature.properties

layers/features/org.eclipse.papyrus.layers.feature/feature.xml

diff --git a/layers/org.eclipse.papyrus.layers.feature/feature.xml b/layers/features/org.eclipse.papyrus.layers.feature/feature.xml
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.feature/feature.xml
rename to layers/features/org.eclipse.papyrus.layers.feature/feature.xml

layers/features/org.eclipse.papyrus.layers.feature/license.html

diff --git a/layers/org.eclipse.papyrus.layers.feature/license.html b/layers/features/org.eclipse.papyrus.layers.feature/license.html
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.feature/license.html
rename to layers/features/org.eclipse.papyrus.layers.feature/license.html

layers/features/org.eclipse.papyrus.layers.feature/pom.xml

diff --git a/layers/features/org.eclipse.papyrus.layers.feature/pom.xml b/layers/features/org.eclipse.papyrus.layers.feature/pom.xml
new file mode 100755
index 0000000..ce3ba75
--- /dev/null
+++ b/layers/features/org.eclipse.papyrus.layers.feature/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.incubation.layers</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.layers.features</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.layers.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+	
+</project>
\ No newline at end of file

layers/features/pom.xml

diff --git a/layers/features/pom.xml b/layers/features/pom.xml
new file mode 100755
index 0000000..f58cb68
--- /dev/null
+++ b/layers/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.incubation.layers</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.layers.parent</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.layers.features</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.layers.feature</module>
+	</modules>	
+	
+</project>
\ No newline at end of file

layers/org.eclipse.papyrus.layers.feature/pom.xml

diff --git a/layers/org.eclipse.papyrus.layers.feature/pom.xml b/layers/org.eclipse.papyrus.layers.feature/pom.xml
deleted file mode 100755
index 97bd663..0000000
--- a/layers/org.eclipse.papyrus.layers.feature/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.layers.parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.layers.feature</artifactId>
-	<packaging>eclipse-feature</packaging>
-</project>
\ No newline at end of file

layers/org.eclipse.papyrus.layers.notationmodel.edit/pom.xml

diff --git a/layers/org.eclipse.papyrus.layers.notationmodel.edit/pom.xml b/layers/org.eclipse.papyrus.layers.notationmodel.edit/pom.xml
deleted file mode 100755
index dce02d1..0000000
--- a/layers/org.eclipse.papyrus.layers.notationmodel.edit/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.layers.parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.layers.notationmodel.edit</artifactId>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

layers/org.eclipse.papyrus.layers.runtime/pom.xml

diff --git a/layers/org.eclipse.papyrus.layers.runtime/pom.xml b/layers/org.eclipse.papyrus.layers.runtime/pom.xml
deleted file mode 100755
index 2083154..0000000
--- a/layers/org.eclipse.papyrus.layers.runtime/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.layers.parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.layers.runtime</artifactId>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

layers/org.eclipse.papyrus.layers.stackmodel.diagram/pom.xml

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.diagram/pom.xml b/layers/org.eclipse.papyrus.layers.stackmodel.diagram/pom.xml
deleted file mode 100755
index 5407504..0000000
--- a/layers/org.eclipse.papyrus.layers.stackmodel.diagram/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.layers.parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.layers.stackmodel.diagram</artifactId>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

layers/org.eclipse.papyrus.layers.stackmodel.edit/pom.xml

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/pom.xml b/layers/org.eclipse.papyrus.layers.stackmodel.edit/pom.xml
deleted file mode 100755
index 6b739ae..0000000
--- a/layers/org.eclipse.papyrus.layers.stackmodel.edit/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.layers.parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.layers.stackmodel.edit</artifactId>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

layers/org.eclipse.papyrus.layers.stackmodel.editor/pom.xml

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/pom.xml b/layers/org.eclipse.papyrus.layers.stackmodel.editor/pom.xml
deleted file mode 100755
index c709230..0000000
--- a/layers/org.eclipse.papyrus.layers.stackmodel.editor/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.layers.parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.layers.stackmodel.editor</artifactId>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

layers/org.eclipse.papyrus.layers.stackmodel/pom.xml

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/pom.xml b/layers/org.eclipse.papyrus.layers.stackmodel/pom.xml
deleted file mode 100755
index 0612b8c..0000000
--- a/layers/org.eclipse.papyrus.layers.stackmodel/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.layers.parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.layers.stackmodel</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

layers/org.eclipse.papyrus.layers.ui/pom.xml

diff --git a/layers/org.eclipse.papyrus.layers.ui/pom.xml b/layers/org.eclipse.papyrus.layers.ui/pom.xml
deleted file mode 100755
index 17f71fa..0000000
--- a/layers/org.eclipse.papyrus.layers.ui/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.layers.parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.layers.ui</artifactId>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

layers/plugins/org.eclipse.papyrus.layers.dev.ui/.classpath

diff --git a/layers/org.eclipse.papyrus.layers.dev.ui/.classpath b/layers/plugins/org.eclipse.papyrus.layers.dev.ui/.classpath
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.dev.ui/.classpath
rename to layers/plugins/org.eclipse.papyrus.layers.dev.ui/.classpath

layers/plugins/org.eclipse.papyrus.layers.dev.ui/.project

diff --git a/layers/org.eclipse.papyrus.layers.dev.ui/.project b/layers/plugins/org.eclipse.papyrus.layers.dev.ui/.project
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.dev.ui/.project
rename to layers/plugins/org.eclipse.papyrus.layers.dev.ui/.project

layers/plugins/org.eclipse.papyrus.layers.dev.ui/.settings/org.eclipse.jdt.core.prefs

diff --git a/layers/org.eclipse.papyrus.layers.dev.ui/.settings/org.eclipse.jdt.core.prefs b/layers/plugins/org.eclipse.papyrus.layers.dev.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.dev.ui/.settings/org.eclipse.jdt.core.prefs
rename to layers/plugins/org.eclipse.papyrus.layers.dev.ui/.settings/org.eclipse.jdt.core.prefs

layers/plugins/org.eclipse.papyrus.layers.dev.ui/.settings/org.eclipse.jdt.ui.prefs

diff --git a/layers/org.eclipse.papyrus.layers.dev.ui/.settings/org.eclipse.jdt.ui.prefs b/layers/plugins/org.eclipse.papyrus.layers.dev.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.dev.ui/.settings/org.eclipse.jdt.ui.prefs
rename to layers/plugins/org.eclipse.papyrus.layers.dev.ui/.settings/org.eclipse.jdt.ui.prefs

layers/plugins/org.eclipse.papyrus.layers.dev.ui/META-INF/MANIFEST.MF

diff --git a/layers/org.eclipse.papyrus.layers.dev.ui/META-INF/MANIFEST.MF b/layers/plugins/org.eclipse.papyrus.layers.dev.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.dev.ui/META-INF/MANIFEST.MF
rename to layers/plugins/org.eclipse.papyrus.layers.dev.ui/META-INF/MANIFEST.MF

layers/plugins/org.eclipse.papyrus.layers.dev.ui/about.html

diff --git a/layers/org.eclipse.papyrus.layers.dev.ui/about.html b/layers/plugins/org.eclipse.papyrus.layers.dev.ui/about.html
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.dev.ui/about.html
rename to layers/plugins/org.eclipse.papyrus.layers.dev.ui/about.html

layers/plugins/org.eclipse.papyrus.layers.dev.ui/build.properties

diff --git a/layers/org.eclipse.papyrus.layers.dev.ui/build.properties b/layers/plugins/org.eclipse.papyrus.layers.dev.ui/build.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.dev.ui/build.properties
rename to layers/plugins/org.eclipse.papyrus.layers.dev.ui/build.properties

layers/plugins/org.eclipse.papyrus.layers.dev.ui/plugin.properties

diff --git a/layers/org.eclipse.papyrus.layers.dev.ui/plugin.properties b/layers/plugins/org.eclipse.papyrus.layers.dev.ui/plugin.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.dev.ui/plugin.properties
rename to layers/plugins/org.eclipse.papyrus.layers.dev.ui/plugin.properties

layers/plugins/org.eclipse.papyrus.layers.dev.ui/plugin.xml

diff --git a/layers/org.eclipse.papyrus.layers.dev.ui/plugin.xml b/layers/plugins/org.eclipse.papyrus.layers.dev.ui/plugin.xml
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.dev.ui/plugin.xml
rename to layers/plugins/org.eclipse.papyrus.layers.dev.ui/plugin.xml

layers/plugins/org.eclipse.papyrus.layers.dev.ui/readme.txt

diff --git a/layers/org.eclipse.papyrus.layers.dev.ui/readme.txt b/layers/plugins/org.eclipse.papyrus.layers.dev.ui/readme.txt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.dev.ui/readme.txt
rename to layers/plugins/org.eclipse.papyrus.layers.dev.ui/readme.txt

layers/plugins/org.eclipse.papyrus.layers.dev.ui/src/org/eclipse/papyrus/layers/dev/ui/Activator.java

diff --git a/layers/org.eclipse.papyrus.layers.dev.ui/src/org/eclipse/papyrus/layers/dev/ui/Activator.java b/layers/plugins/org.eclipse.papyrus.layers.dev.ui/src/org/eclipse/papyrus/layers/dev/ui/Activator.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.dev.ui/src/org/eclipse/papyrus/layers/dev/ui/Activator.java
rename to layers/plugins/org.eclipse.papyrus.layers.dev.ui/src/org/eclipse/papyrus/layers/dev/ui/Activator.java

layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/.classpath

diff --git a/layers/org.eclipse.papyrus.layers.notationmodel.edit/.classpath b/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/.classpath
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.notationmodel.edit/.classpath
rename to layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/.classpath

layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/.project

diff --git a/layers/org.eclipse.papyrus.layers.notationmodel.edit/.project b/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/.project
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.notationmodel.edit/.project
rename to layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/.project

layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/.settings/org.eclipse.jdt.core.prefs

diff --git a/layers/org.eclipse.papyrus.layers.notationmodel.edit/.settings/org.eclipse.jdt.core.prefs b/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.notationmodel.edit/.settings/org.eclipse.jdt.core.prefs
rename to layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/.settings/org.eclipse.jdt.core.prefs

layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/.settings/org.eclipse.jdt.ui.prefs

diff --git a/layers/org.eclipse.papyrus.layers.notationmodel.edit/.settings/org.eclipse.jdt.ui.prefs b/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.notationmodel.edit/.settings/org.eclipse.jdt.ui.prefs
rename to layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/.settings/org.eclipse.jdt.ui.prefs

layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/META-INF/MANIFEST.MF

diff --git a/layers/org.eclipse.papyrus.layers.notationmodel.edit/META-INF/MANIFEST.MF b/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/META-INF/MANIFEST.MF
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.notationmodel.edit/META-INF/MANIFEST.MF
rename to layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/META-INF/MANIFEST.MF

layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/about.html

diff --git a/layers/org.eclipse.papyrus.layers.notationmodel.edit/about.html b/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/about.html
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.notationmodel.edit/about.html
rename to layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/about.html

layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/build.properties

diff --git a/layers/org.eclipse.papyrus.layers.notationmodel.edit/build.properties b/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/build.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.notationmodel.edit/build.properties
rename to layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/build.properties

layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/plugin.properties

diff --git a/layers/org.eclipse.papyrus.layers.notationmodel.edit/plugin.properties b/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/plugin.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.notationmodel.edit/plugin.properties
rename to layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/plugin.properties

layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/pom.xml

diff --git a/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/pom.xml b/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/pom.xml
new file mode 100755
index 0000000..0d245fe
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/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.incubation.layers</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.layers.plugins</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>org.eclipse.papyrus.layers.notationmodel.edit</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	
+</project>
\ No newline at end of file

layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/Activator.java

diff --git a/layers/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/Activator.java b/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/Activator.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/Activator.java
rename to layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/Activator.java

layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/ConnectorItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/ConnectorItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/ConnectorItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/ConnectorItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/ConnectorItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/DiagramItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/DiagramItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/DiagramItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/DiagramItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/DiagramItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/NodeItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/NodeItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/NodeItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/NodeItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/NodeItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/NotationItemProviderAdapterFactory.java

diff --git a/layers/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/NotationItemProviderAdapterFactory.java b/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/NotationItemProviderAdapterFactory.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/NotationItemProviderAdapterFactory.java
rename to layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/NotationItemProviderAdapterFactory.java

layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/ShapeItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/ShapeItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/ShapeItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/ShapeItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/layers/notationmodel/edit/ShapeItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.runtime/.classpath

diff --git a/layers/org.eclipse.papyrus.layers.runtime/.classpath b/layers/plugins/org.eclipse.papyrus.layers.runtime/.classpath
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/.classpath
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/.classpath

layers/plugins/org.eclipse.papyrus.layers.runtime/.project

diff --git a/layers/org.eclipse.papyrus.layers.runtime/.project b/layers/plugins/org.eclipse.papyrus.layers.runtime/.project
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/.project
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/.project

layers/plugins/org.eclipse.papyrus.layers.runtime/.settings/org.eclipse.jdt.core.prefs

diff --git a/layers/org.eclipse.papyrus.layers.runtime/.settings/org.eclipse.jdt.core.prefs b/layers/plugins/org.eclipse.papyrus.layers.runtime/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/.settings/org.eclipse.jdt.core.prefs
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/.settings/org.eclipse.jdt.core.prefs

layers/plugins/org.eclipse.papyrus.layers.runtime/.settings/org.eclipse.jdt.ui.prefs

diff --git a/layers/org.eclipse.papyrus.layers.runtime/.settings/org.eclipse.jdt.ui.prefs b/layers/plugins/org.eclipse.papyrus.layers.runtime/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/.settings/org.eclipse.jdt.ui.prefs
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/.settings/org.eclipse.jdt.ui.prefs

layers/plugins/org.eclipse.papyrus.layers.runtime/META-INF/MANIFEST.MF

diff --git a/layers/org.eclipse.papyrus.layers.runtime/META-INF/MANIFEST.MF b/layers/plugins/org.eclipse.papyrus.layers.runtime/META-INF/MANIFEST.MF
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/META-INF/MANIFEST.MF
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/META-INF/MANIFEST.MF

layers/plugins/org.eclipse.papyrus.layers.runtime/about.html

diff --git a/layers/org.eclipse.papyrus.layers.runtime/about.html b/layers/plugins/org.eclipse.papyrus.layers.runtime/about.html
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/about.html
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/about.html

layers/plugins/org.eclipse.papyrus.layers.runtime/build.properties

diff --git a/layers/org.eclipse.papyrus.layers.runtime/build.properties b/layers/plugins/org.eclipse.papyrus.layers.runtime/build.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/build.properties
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/build.properties

layers/plugins/org.eclipse.papyrus.layers.runtime/plugin.properties

diff --git a/layers/org.eclipse.papyrus.layers.runtime/plugin.properties b/layers/plugins/org.eclipse.papyrus.layers.runtime/plugin.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/plugin.properties
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/plugin.properties

layers/plugins/org.eclipse.papyrus.layers.runtime/plugin.xml

diff --git a/layers/org.eclipse.papyrus.layers.runtime/plugin.xml b/layers/plugins/org.eclipse.papyrus.layers.runtime/plugin.xml
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/plugin.xml
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/plugin.xml

layers/plugins/org.eclipse.papyrus.layers.runtime/pom.xml

diff --git a/layers/plugins/org.eclipse.papyrus.layers.runtime/pom.xml b/layers/plugins/org.eclipse.papyrus.layers.runtime/pom.xml
new file mode 100755
index 0000000..1cd0933
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.layers.runtime/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.incubation.layers</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.layers.plugins</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>org.eclipse.papyrus.layers.runtime</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	
+</project>
\ No newline at end of file

layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/Activator.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/Activator.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/Activator.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/Activator.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/Activator.java

layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/ILayersModelEventListener.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/ILayersModelEventListener.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/ILayersModelEventListener.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/ILayersModelEventListener.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/ILayersModelEventListener.java

layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/ILayersStackApplicationEventListener.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/ILayersStackApplicationEventListener.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/ILayersStackApplicationEventListener.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/ILayersStackApplicationEventListener.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/ILayersStackApplicationEventListener.java

layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/INotationDiagramRemovedEventListener.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/INotationDiagramRemovedEventListener.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/INotationDiagramRemovedEventListener.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/INotationDiagramRemovedEventListener.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/INotationDiagramRemovedEventListener.java

layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayerStackApplicationSynchronizer.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayerStackApplicationSynchronizer.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayerStackApplicationSynchronizer.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayerStackApplicationSynchronizer.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayerStackApplicationSynchronizer.java

layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayerStackSynchronizer.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayerStackSynchronizer.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayerStackSynchronizer.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayerStackSynchronizer.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayerStackSynchronizer.java

layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayersModelEventNotifier.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayersModelEventNotifier.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayersModelEventNotifier.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayersModelEventNotifier.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayersModelEventNotifier.java

layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayersModelEventUtils.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayersModelEventUtils.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayersModelEventUtils.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayersModelEventUtils.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayersModelEventUtils.java

layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayersStackAndApplicationLifeCycleEventNotifier.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayersStackAndApplicationLifeCycleEventNotifier.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayersStackAndApplicationLifeCycleEventNotifier.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayersStackAndApplicationLifeCycleEventNotifier.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayersStackAndApplicationLifeCycleEventNotifier.java

layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayersStackApplicationEventNotifier.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayersStackApplicationEventNotifier.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayersStackApplicationEventNotifier.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayersStackApplicationEventNotifier.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/LayersStackApplicationEventNotifier.java

layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/NotationDiagramHelper.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/NotationDiagramHelper.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/NotationDiagramHelper.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/NotationDiagramHelper.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/NotationDiagramHelper.java

layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/NotationDiagramRemovedFromResourceEventNotifier.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/NotationDiagramRemovedFromResourceEventNotifier.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/NotationDiagramRemovedFromResourceEventNotifier.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/NotationDiagramRemovedFromResourceEventNotifier.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/NotationDiagramRemovedFromResourceEventNotifier.java

layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/model/ILayersModelRootEventListener.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/model/ILayersModelRootEventListener.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/model/ILayersModelRootEventListener.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/model/ILayersModelRootEventListener.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/model/ILayersModelRootEventListener.java

layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/model/LayersModel.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/model/LayersModel.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/model/LayersModel.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/model/LayersModel.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/model/LayersModel.java

layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/model/LayersModelEventRootNotifier.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/model/LayersModelEventRootNotifier.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/model/LayersModelEventRootNotifier.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/model/LayersModelEventRootNotifier.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/model/LayersModelEventRootNotifier.java

layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/notifier/AbstractDerivedViewLayerNotifier.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/notifier/AbstractDerivedViewLayerNotifier.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/notifier/AbstractDerivedViewLayerNotifier.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/notifier/AbstractDerivedViewLayerNotifier.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/notifier/AbstractDerivedViewLayerNotifier.java

layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/notifier/DiagramChangedEventNotifier.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/notifier/DiagramChangedEventNotifier.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/notifier/DiagramChangedEventNotifier.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/notifier/DiagramChangedEventNotifier.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/notifier/DiagramChangedEventNotifier.java

layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/notifier/DomainChangedEventNotifier.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/notifier/DomainChangedEventNotifier.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/notifier/DomainChangedEventNotifier.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/notifier/DomainChangedEventNotifier.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/notifier/DomainChangedEventNotifier.java

layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/service/LayersApplicationService.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/service/LayersApplicationService.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/service/LayersApplicationService.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/service/LayersApplicationService.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/service/LayersApplicationService.java

layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/utils/package-info.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/utils/package-info.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/utils/package-info.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/utils/package-info.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/src/org/eclipse/papyrus/layers/runtime/utils/package-info.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/DiagramViewEventNotifierTest.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/DiagramViewEventNotifierTest.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/DiagramViewEventNotifierTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/DiagramViewEventNotifierTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/DiagramViewEventNotifierTest.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackApplicationSynchronizerEventTest.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackApplicationSynchronizerEventTest.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackApplicationSynchronizerEventTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackApplicationSynchronizerEventTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackApplicationSynchronizerEventTest.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackApplicationSynchronizerSubclass.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackApplicationSynchronizerSubclass.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackApplicationSynchronizerSubclass.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackApplicationSynchronizerSubclass.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackApplicationSynchronizerSubclass.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackApplicationSynchronizerTest.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackApplicationSynchronizerTest.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackApplicationSynchronizerTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackApplicationSynchronizerTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackApplicationSynchronizerTest.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackSynchronizerSubclass.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackSynchronizerSubclass.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackSynchronizerSubclass.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackSynchronizerSubclass.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackSynchronizerSubclass.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackSynchronizerTest.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackSynchronizerTest.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackSynchronizerTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackSynchronizerTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackSynchronizerTest.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackSynchronizerWithApplicationTest.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackSynchronizerWithApplicationTest.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackSynchronizerWithApplicationTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackSynchronizerWithApplicationTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayerStackSynchronizerWithApplicationTest.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayersModelEventNotifierTest.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayersModelEventNotifierTest.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayersModelEventNotifierTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayersModelEventNotifierTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayersModelEventNotifierTest.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayersStackAndApplicationLifeCycleEventNotifierTest.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayersStackAndApplicationLifeCycleEventNotifierTest.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayersStackAndApplicationLifeCycleEventNotifierTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayersStackAndApplicationLifeCycleEventNotifierTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayersStackAndApplicationLifeCycleEventNotifierTest.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayersStackApplicationEventNotifierTest.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayersStackApplicationEventNotifierTest.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayersStackApplicationEventNotifierTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayersStackApplicationEventNotifierTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/LayersStackApplicationEventNotifierTest.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/NotationDiagramMngrTest.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/NotationDiagramMngrTest.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/NotationDiagramMngrTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/NotationDiagramMngrTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/NotationDiagramMngrTest.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/NotationDiagramRemovedFromResourceEventNotifierTest.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/NotationDiagramRemovedFromResourceEventNotifierTest.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/NotationDiagramRemovedFromResourceEventNotifierTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/NotationDiagramRemovedFromResourceEventNotifierTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/NotationDiagramRemovedFromResourceEventNotifierTest.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/TraceDiagramViewEventListener.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/TraceDiagramViewEventListener.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/TraceDiagramViewEventListener.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/TraceDiagramViewEventListener.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/TraceDiagramViewEventListener.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/TraceLayersModelEventListener.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/TraceLayersModelEventListener.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/TraceLayersModelEventListener.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/TraceLayersModelEventListener.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/TraceLayersModelEventListener.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/TraceLayersStackApplicationEventListener.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/TraceLayersStackApplicationEventListener.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/TraceLayersStackApplicationEventListener.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/TraceLayersStackApplicationEventListener.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/TraceLayersStackApplicationEventListener.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/TraceNotationDiagramRemovedFromResourceEventListener.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/TraceNotationDiagramRemovedFromResourceEventListener.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/TraceNotationDiagramRemovedFromResourceEventListener.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/TraceNotationDiagramRemovedFromResourceEventListener.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/TraceNotationDiagramRemovedFromResourceEventListener.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/model/LayersModelRootEventNotifierTest.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/model/LayersModelRootEventNotifierTest.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/model/LayersModelRootEventNotifierTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/model/LayersModelRootEventNotifierTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/model/LayersModelRootEventNotifierTest.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/model/LayersModelTest.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/model/LayersModelTest.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/model/LayersModelTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/model/LayersModelTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/model/LayersModelTest.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/model/TraceLayersModelRootEventListener.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/model/TraceLayersModelRootEventListener.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/model/TraceLayersModelRootEventListener.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/model/TraceLayersModelRootEventListener.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/model/TraceLayersModelRootEventListener.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/utils/ECoreUtilsTest.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/utils/ECoreUtilsTest.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/utils/ECoreUtilsTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/utils/ECoreUtilsTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/utils/ECoreUtilsTest.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/utils/NotationDiagramTestUtils.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/utils/NotationDiagramTestUtils.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/utils/NotationDiagramTestUtils.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/utils/NotationDiagramTestUtils.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/utils/NotationDiagramTestUtils.java

layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/utils/TriggeredEventTraces.java

diff --git a/layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/utils/TriggeredEventTraces.java b/layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/utils/TriggeredEventTraces.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/utils/TriggeredEventTraces.java
rename to layers/plugins/org.eclipse.papyrus.layers.runtime/tests/org/eclipse/papyrus/layers/runtime/utils/TriggeredEventTraces.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/.classpath

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.diagram/.classpath b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/.classpath
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.diagram/.classpath
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/.classpath

layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/.project

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.diagram/.project b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/.project
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.diagram/.project
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/.project

layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/.settings/org.eclipse.jdt.core.prefs

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.diagram/.settings/org.eclipse.jdt.core.prefs b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.diagram/.settings/org.eclipse.jdt.core.prefs
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/.settings/org.eclipse.jdt.core.prefs

layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/.settings/org.eclipse.jdt.ui.prefs

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.diagram/.settings/org.eclipse.jdt.ui.prefs b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.diagram/.settings/org.eclipse.jdt.ui.prefs
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/.settings/org.eclipse.jdt.ui.prefs

layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/META-INF/MANIFEST.MF

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.diagram/META-INF/MANIFEST.MF b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/META-INF/MANIFEST.MF
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.diagram/META-INF/MANIFEST.MF
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/META-INF/MANIFEST.MF

layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/about.html

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.diagram/about.html b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/about.html
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.diagram/about.html
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/about.html

layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/build.properties

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.diagram/build.properties b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/build.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.diagram/build.properties
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/build.properties

layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/icons/layerDiagram.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.diagram/icons/layerDiagram.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/icons/layerDiagram.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.diagram/icons/layerDiagram.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/icons/layerDiagram.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/plugin.properties

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.diagram/plugin.properties b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/plugin.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.diagram/plugin.properties
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/plugin.properties

layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/plugin.xml

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.diagram/plugin.xml b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/plugin.xml
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.diagram/plugin.xml
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/plugin.xml

layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/pom.xml

diff --git a/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/pom.xml b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/pom.xml
new file mode 100755
index 0000000..d4f6dff
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/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.incubation.layers</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.layers.plugins</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>org.eclipse.papyrus.layers.stackmodel.diagram</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	
+</project>
\ No newline at end of file

layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/Activator.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/Activator.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/Activator.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/Activator.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/Activator.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/CreateLayersTreeDiagramHandler.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/CreateLayersTreeDiagramHandler.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/CreateLayersTreeDiagramHandler.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/CreateLayersTreeDiagramHandler.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/CreateLayersTreeDiagramHandler.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/DynamicContextMenu.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/DynamicContextMenu.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/DynamicContextMenu.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/DynamicContextMenu.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/DynamicContextMenu.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/LayersDiagramActionBarContributor.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/LayersDiagramActionBarContributor.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/LayersDiagramActionBarContributor.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/LayersDiagramActionBarContributor.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/LayersDiagramActionBarContributor.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/LayersTreeDiagramEditorFactory.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/LayersTreeDiagramEditorFactory.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/LayersTreeDiagramEditorFactory.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/LayersTreeDiagramEditorFactory.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/LayersTreeDiagramEditorFactory.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/LayersTreeEditorDiagram.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/LayersTreeEditorDiagram.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/LayersTreeEditorDiagram.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/LayersTreeEditorDiagram.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/LayersTreeEditorDiagram.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/ui/handlers/AbstractLayerCommand.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/ui/handlers/AbstractLayerCommand.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/ui/handlers/AbstractLayerCommand.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/ui/handlers/AbstractLayerCommand.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/ui/handlers/AbstractLayerCommand.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/ui/handlers/DynamicCreateChildMenu.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/ui/handlers/DynamicCreateChildMenu.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/ui/handlers/DynamicCreateChildMenu.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/ui/handlers/DynamicCreateChildMenu.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/ui/handlers/DynamicCreateChildMenu.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/ui/handlers/ShowCreateChildCommand.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/ui/handlers/ShowCreateChildCommand.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/ui/handlers/ShowCreateChildCommand.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/ui/handlers/ShowCreateChildCommand.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.diagram/src/org/eclipse/papyrus/layers/stackmodel/diagram/ui/handlers/ShowCreateChildCommand.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/.classpath

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/.classpath b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/.classpath
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/.classpath
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/.classpath

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/.project

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/.project b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/.project
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/.project
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/.project

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/.settings/org.eclipse.jdt.core.prefs

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/.settings/org.eclipse.jdt.core.prefs b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/.settings/org.eclipse.jdt.core.prefs
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/.settings/org.eclipse.jdt.core.prefs

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/.settings/org.eclipse.jdt.ui.prefs

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/.settings/org.eclipse.jdt.ui.prefs b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/.settings/org.eclipse.jdt.ui.prefs
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/.settings/org.eclipse.jdt.ui.prefs

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/META-INF/MANIFEST.MF

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/META-INF/MANIFEST.MF b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/META-INF/MANIFEST.MF
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/META-INF/MANIFEST.MF
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/META-INF/MANIFEST.MF

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/about.html

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/about.html b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/about.html
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/about.html
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/about.html

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/build.properties

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/build.properties b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/build.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/build.properties
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/build.properties

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateAbstractLayer_propertyValueMap_StringToTypeInstanceMap.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateAbstractLayer_propertyValueMap_StringToTypeInstanceMap.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateAbstractLayer_propertyValueMap_StringToTypeInstanceMap.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateAbstractLayer_propertyValueMap_StringToTypeInstanceMap.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateAbstractLayer_propertyValueMap_StringToTypeInstanceMap.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFillInstance_fillColor_ColorInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFillInstance_fillColor_ColorInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFillInstance_fillColor_ColorInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFillInstance_fillColor_ColorInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFillInstance_fillColor_ColorInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_BooleanType.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_BooleanType.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_BooleanType.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_BooleanType.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_BooleanType.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Color.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Color.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Color.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Color.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Color.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_CustomType.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_CustomType.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_CustomType.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_CustomType.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_CustomType.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Fill.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Fill.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Fill.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Fill.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Fill.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Folder.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Folder.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Folder.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Folder.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Folder.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_FontType.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_FontType.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_FontType.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_FontType.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_FontType.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_IntType.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_IntType.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_IntType.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_IntType.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_IntType.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_LayersStackApplication.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_LayersStackApplication.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_LayersStackApplication.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_LayersStackApplication.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_LayersStackApplication.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_LineType.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_LineType.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_LineType.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_LineType.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_LineType.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Metamodel.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Metamodel.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Metamodel.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Metamodel.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Metamodel.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Property.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Property.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Property.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Property.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_Property.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_StringType.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_StringType.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_StringType.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_StringType.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_elements_StringType.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_Folder.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_Folder.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_Folder.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_Folder.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_Folder.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_FolderElement.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_FolderElement.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_FolderElement.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_FolderElement.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_FolderElement.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_InstanciableElement.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_InstanciableElement.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_InstanciableElement.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_InstanciableElement.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_InstanciableElement.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_LayerOperatorConfig.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_LayerOperatorConfig.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_LayerOperatorConfig.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_LayerOperatorConfig.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_LayerOperatorConfig.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_LayerOperatorMultipleBinding.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_LayerOperatorMultipleBinding.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_LayerOperatorMultipleBinding.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_LayerOperatorMultipleBinding.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_LayerOperatorMultipleBinding.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_LayerOperatorToOperatorBinding.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_LayerOperatorToOperatorBinding.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_LayerOperatorToOperatorBinding.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_LayerOperatorToOperatorBinding.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_LayerOperatorToOperatorBinding.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_OperatorConfig.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_OperatorConfig.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_OperatorConfig.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_OperatorConfig.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_OperatorConfig.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_PropertyId.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_PropertyId.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_PropertyId.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_PropertyId.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_PropertyId.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_TypeConfig.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_TypeConfig.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_TypeConfig.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_TypeConfig.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateFolder_folderElements_TypeConfig.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerDescriptorRegistry_layerDescriptors_LayerDescriptor.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerDescriptorRegistry_layerDescriptors_LayerDescriptor.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerDescriptorRegistry_layerDescriptors_LayerDescriptor.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerDescriptorRegistry_layerDescriptors_LayerDescriptor.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerDescriptorRegistry_layerDescriptors_LayerDescriptor.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerDescriptorRegistry_layerDescriptors_RegExpLayerDescriptor.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerDescriptorRegistry_layerDescriptors_RegExpLayerDescriptor.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerDescriptorRegistry_layerDescriptors_RegExpLayerDescriptor.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerDescriptorRegistry_layerDescriptors_RegExpLayerDescriptor.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerDescriptorRegistry_layerDescriptors_RegExpLayerDescriptor.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerDescriptorRegistry_layerDescriptors_SimpleLayerDescriptor.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerDescriptorRegistry_layerDescriptors_SimpleLayerDescriptor.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerDescriptorRegistry_layerDescriptors_SimpleLayerDescriptor.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerDescriptorRegistry_layerDescriptors_SimpleLayerDescriptor.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerDescriptorRegistry_layerDescriptors_SimpleLayerDescriptor.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerNamedStyle_layersStack_LayersStack.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerNamedStyle_layersStack_LayersStack.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerNamedStyle_layersStack_LayersStack.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerNamedStyle_layersStack_LayersStack.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerNamedStyle_layersStack_LayersStack.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_AndStackedLayerOperatorDescriptor.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_AndStackedLayerOperatorDescriptor.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_AndStackedLayerOperatorDescriptor.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_AndStackedLayerOperatorDescriptor.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_AndStackedLayerOperatorDescriptor.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_LayerOperatorDescriptor.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_LayerOperatorDescriptor.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_LayerOperatorDescriptor.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_LayerOperatorDescriptor.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_LayerOperatorDescriptor.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_OrStackedLayerOperatorDescriptor.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_OrStackedLayerOperatorDescriptor.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_OrStackedLayerOperatorDescriptor.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_OrStackedLayerOperatorDescriptor.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_OrStackedLayerOperatorDescriptor.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_StackedLayerOperatorDescriptor.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_StackedLayerOperatorDescriptor.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_StackedLayerOperatorDescriptor.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_StackedLayerOperatorDescriptor.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_StackedLayerOperatorDescriptor.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_TopLayerOperatorDescriptor.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_TopLayerOperatorDescriptor.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_TopLayerOperatorDescriptor.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_TopLayerOperatorDescriptor.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_descriptors_TopLayerOperatorDescriptor.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_propertyOperators_CustomPropertyOperator.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_propertyOperators_CustomPropertyOperator.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_propertyOperators_CustomPropertyOperator.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_propertyOperators_CustomPropertyOperator.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_propertyOperators_CustomPropertyOperator.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_propertyOperators_DefaultPropertyOperator.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_propertyOperators_DefaultPropertyOperator.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_propertyOperators_DefaultPropertyOperator.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_propertyOperators_DefaultPropertyOperator.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_propertyOperators_DefaultPropertyOperator.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_propertyOperators_PropertyOperator.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_propertyOperators_PropertyOperator.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_propertyOperators_PropertyOperator.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_propertyOperators_PropertyOperator.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorDescriptorRegistry_propertyOperators_PropertyOperator.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorMultipleBinding_bindings_OperatorBinding.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorMultipleBinding_bindings_OperatorBinding.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorMultipleBinding_bindings_OperatorBinding.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorMultipleBinding_bindings_OperatorBinding.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorMultipleBinding_bindings_OperatorBinding.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorMultipleBinding_bindings_SimpleBinding.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorMultipleBinding_bindings_SimpleBinding.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorMultipleBinding_bindings_SimpleBinding.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorMultipleBinding_bindings_SimpleBinding.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperatorMultipleBinding_bindings_SimpleBinding.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_AllViewsDerivedLayer.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_AllViewsDerivedLayer.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_AllViewsDerivedLayer.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_AllViewsDerivedLayer.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_AllViewsDerivedLayer.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_CustomLayerOperator.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_CustomLayerOperator.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_CustomLayerOperator.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_CustomLayerOperator.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_CustomLayerOperator.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_Layer.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_Layer.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_Layer.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_Layer.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_Layer.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_RegExpLayer.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_RegExpLayer.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_RegExpLayer.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_RegExpLayer.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_RegExpLayer.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_StackedLayerOperator.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_StackedLayerOperator.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_StackedLayerOperator.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_StackedLayerOperator.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_StackedLayerOperator.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_TopLayerOperator.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_TopLayerOperator.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_TopLayerOperator.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_TopLayerOperator.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayerOperator_layers_TopLayerOperator.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayer_propertyValueMap_StringToTypeInstanceMap.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayer_propertyValueMap_StringToTypeInstanceMap.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayer_propertyValueMap_StringToTypeInstanceMap.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayer_propertyValueMap_StringToTypeInstanceMap.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayer_propertyValueMap_StringToTypeInstanceMap.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayer_propertyValues_BooleanInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayer_propertyValues_BooleanInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayer_propertyValues_BooleanInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayer_propertyValues_BooleanInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayer_propertyValues_BooleanInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayer_propertyValues_IntInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayer_propertyValues_IntInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayer_propertyValues_IntInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayer_propertyValues_IntInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayer_propertyValues_IntInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayer_propertyValues_StringInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayer_propertyValues_StringInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayer_propertyValues_StringInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayer_propertyValues_StringInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayer_propertyValues_StringInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_factory_LayerApplicationFactory.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_factory_LayerApplicationFactory.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_factory_LayerApplicationFactory.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_factory_LayerApplicationFactory.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_factory_LayerApplicationFactory.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_layerDescriptorRegistry_LayerDescriptorRegistry.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_layerDescriptorRegistry_LayerDescriptorRegistry.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_layerDescriptorRegistry_LayerDescriptorRegistry.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_layerDescriptorRegistry_LayerDescriptorRegistry.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_layerDescriptorRegistry_LayerDescriptorRegistry.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_layerOperatorDescriptorRegistry_LayerOperatorDescriptorRegistry.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_layerOperatorDescriptorRegistry_LayerOperatorDescriptorRegistry.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_layerOperatorDescriptorRegistry_LayerOperatorDescriptorRegistry.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_layerOperatorDescriptorRegistry_LayerOperatorDescriptorRegistry.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_layerOperatorDescriptorRegistry_LayerOperatorDescriptorRegistry.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_layerStackRegistry_LayerStackDescriptorRegistry.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_layerStackRegistry_LayerStackDescriptorRegistry.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_layerStackRegistry_LayerStackDescriptorRegistry.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_layerStackRegistry_LayerStackDescriptorRegistry.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_layerStackRegistry_LayerStackDescriptorRegistry.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_layersStacks_LayersStack.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_layersStacks_LayersStack.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_layersStacks_LayersStack.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_layersStacks_LayersStack.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_layersStacks_LayersStack.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_propertyRegistry_PropertyRegistry.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_propertyRegistry_PropertyRegistry.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_propertyRegistry_PropertyRegistry.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_propertyRegistry_PropertyRegistry.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_propertyRegistry_PropertyRegistry.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_propertySetterRegistry_PropertySetterRegistry.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_propertySetterRegistry_PropertySetterRegistry.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_propertySetterRegistry_PropertySetterRegistry.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_propertySetterRegistry_PropertySetterRegistry.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStackApplication_propertySetterRegistry_PropertySetterRegistry.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_AllViewsDerivedLayer.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_AllViewsDerivedLayer.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_AllViewsDerivedLayer.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_AllViewsDerivedLayer.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_AllViewsDerivedLayer.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_CustomLayerOperator.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_CustomLayerOperator.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_CustomLayerOperator.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_CustomLayerOperator.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_CustomLayerOperator.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_Layer.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_Layer.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_Layer.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_Layer.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_Layer.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_RegExpLayer.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_RegExpLayer.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_RegExpLayer.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_RegExpLayer.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_RegExpLayer.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_StackedLayerOperator.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_StackedLayerOperator.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_StackedLayerOperator.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_StackedLayerOperator.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_StackedLayerOperator.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_TopLayerOperator.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_TopLayerOperator.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_TopLayerOperator.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_TopLayerOperator.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateLayersStack_layers_TopLayerOperator.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertyRegistry_properties_Property.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertyRegistry_properties_Property.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertyRegistry_properties_Property.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertyRegistry_properties_Property.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertyRegistry_properties_Property.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertyRegistry_typeRegistry_TypeRegistry.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertyRegistry_typeRegistry_TypeRegistry.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertyRegistry_typeRegistry_TypeRegistry.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertyRegistry_typeRegistry_TypeRegistry.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertyRegistry_typeRegistry_TypeRegistry.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_FillPropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_FillPropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_FillPropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_FillPropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_FillPropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_FontPropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_FontPropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_FontPropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_FontPropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_FontPropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_IsValidPropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_IsValidPropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_IsValidPropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_IsValidPropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_IsValidPropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_IsVisiblePropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_IsVisiblePropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_IsVisiblePropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_IsVisiblePropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_IsVisiblePropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_LinePropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_LinePropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_LinePropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_LinePropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_LinePropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_NullPropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_NullPropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_NullPropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_NullPropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_NullPropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_PropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_PropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_PropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_PropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_PropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_isAbstractUmlSetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_isAbstractUmlSetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_isAbstractUmlSetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_isAbstractUmlSetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_propertySetters_isAbstractUmlSetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_setterMap_StringToPropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_setterMap_StringToPropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_setterMap_StringToPropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_setterMap_StringToPropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreatePropertySetterRegistry_setterMap_StringToPropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_BooleanInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_BooleanInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_BooleanInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_BooleanInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_BooleanInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_ColorInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_ColorInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_ColorInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_ColorInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_ColorInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_FillInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_FillInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_FillInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_FillInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_FillInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_FontInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_FontInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_FontInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_FontInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_FontInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_IntInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_IntInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_IntInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_IntInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_IntInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_LineInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_LineInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_LineInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_LineInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_LineInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_NullInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_NullInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_NullInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_NullInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_NullInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_StringInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_StringInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_StringInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_StringInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateProperty_defaultValue_StringInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertyIndexMap_value_PropertyIndex.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertyIndexMap_value_PropertyIndex.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertyIndexMap_value_PropertyIndex.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertyIndexMap_value_PropertyIndex.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertyIndexMap_value_PropertyIndex.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_FillPropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_FillPropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_FillPropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_FillPropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_FillPropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_FontPropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_FontPropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_FontPropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_FontPropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_FontPropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_IsValidPropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_IsValidPropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_IsValidPropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_IsValidPropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_IsValidPropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_IsVisiblePropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_IsVisiblePropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_IsVisiblePropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_IsVisiblePropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_IsVisiblePropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_LinePropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_LinePropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_LinePropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_LinePropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_LinePropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_NullPropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_NullPropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_NullPropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_NullPropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_NullPropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_PropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_PropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_PropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_PropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_PropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_isAbstractUmlSetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_isAbstractUmlSetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_isAbstractUmlSetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_isAbstractUmlSetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToPropertySetter_value_isAbstractUmlSetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_BooleanInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_BooleanInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_BooleanInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_BooleanInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_BooleanInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_ColorInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_ColorInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_ColorInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_ColorInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_ColorInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_FillInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_FillInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_FillInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_FillInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_FillInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_FontInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_FontInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_FontInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_FontInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_FontInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_IntInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_IntInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_IntInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_IntInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_IntInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_LineInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_LineInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_LineInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_LineInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_LineInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_NullInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_NullInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_NullInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_NullInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_NullInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_StringInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_StringInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_StringInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_StringInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_StringInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_BooleanType.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_BooleanType.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_BooleanType.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_BooleanType.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_BooleanType.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_Color.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_Color.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_Color.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_Color.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_Color.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_CustomType.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_CustomType.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_CustomType.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_CustomType.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_CustomType.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_Fill.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_Fill.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_Fill.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_Fill.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_Fill.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_FontType.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_FontType.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_FontType.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_FontType.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_FontType.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_IntType.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_IntType.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_IntType.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_IntType.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_IntType.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_LineType.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_LineType.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_LineType.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_LineType.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_LineType.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_StringType.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_StringType.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_StringType.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_StringType.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateStringToTypeMap_value_StringType.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateTypeRegistry_types_StringToTypeMap.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateTypeRegistry_types_StringToTypeMap.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateTypeRegistry_types_StringToTypeMap.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateTypeRegistry_types_StringToTypeMap.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/ctool16/CreateTypeRegistry_types_StringToTypeMap.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/AbstractLayerOperator.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/AbstractLayerOperator.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/AbstractLayerOperator.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/AbstractLayerOperator.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/AbstractLayerOperator.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/AllViewsDerivedLayer.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/AllViewsDerivedLayer.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/AllViewsDerivedLayer.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/AllViewsDerivedLayer.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/AllViewsDerivedLayer.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/AndStackedLayerOperatorDescriptor.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/AndStackedLayerOperatorDescriptor.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/AndStackedLayerOperatorDescriptor.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/AndStackedLayerOperatorDescriptor.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/AndStackedLayerOperatorDescriptor.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/BooleanInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/BooleanInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/BooleanInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/BooleanInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/BooleanInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/BooleanType.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/BooleanType.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/BooleanType.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/BooleanType.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/BooleanType.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Color.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Color.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Color.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Color.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Color.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/ColorInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/ColorInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/ColorInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/ColorInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/ColorInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/CustomLayerOperator.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/CustomLayerOperator.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/CustomLayerOperator.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/CustomLayerOperator.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/CustomLayerOperator.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/CustomPropertyOperator.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/CustomPropertyOperator.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/CustomPropertyOperator.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/CustomPropertyOperator.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/CustomPropertyOperator.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/CustomType.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/CustomType.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/CustomType.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/CustomType.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/CustomType.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/DefaultPropertyOperator.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/DefaultPropertyOperator.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/DefaultPropertyOperator.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/DefaultPropertyOperator.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/DefaultPropertyOperator.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Fill.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Fill.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Fill.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Fill.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Fill.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FillInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FillInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FillInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FillInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FillInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FillPropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FillPropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FillPropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FillPropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FillPropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Folder.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Folder.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Folder.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Folder.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Folder.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FolderElement.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FolderElement.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FolderElement.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FolderElement.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FolderElement.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FontInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FontInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FontInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FontInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FontInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FontPropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FontPropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FontPropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FontPropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FontPropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FontType.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FontType.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FontType.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FontType.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/FontType.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/InstanciableElement.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/InstanciableElement.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/InstanciableElement.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/InstanciableElement.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/InstanciableElement.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/IntInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/IntInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/IntInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/IntInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/IntInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/IntType.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/IntType.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/IntType.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/IntType.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/IntType.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/IsValidPropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/IsValidPropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/IsValidPropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/IsValidPropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/IsValidPropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/IsVisiblePropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/IsVisiblePropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/IsVisiblePropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/IsVisiblePropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/IsVisiblePropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Layer.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Layer.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Layer.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Layer.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Layer.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerApplicationFactory.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerApplicationFactory.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerApplicationFactory.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerApplicationFactory.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerApplicationFactory.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerDescriptor.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerDescriptor.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerDescriptor.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerDescriptor.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerDescriptor.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerDescriptorRegistry.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerDescriptorRegistry.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerDescriptorRegistry.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerDescriptorRegistry.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerDescriptorRegistry.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerNamedStyle.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerNamedStyle.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerNamedStyle.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerNamedStyle.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerNamedStyle.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorConfig.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorConfig.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorConfig.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorConfig.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorConfig.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorDescriptor.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorDescriptor.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorDescriptor.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorDescriptor.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorDescriptor.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorDescriptorRegistry.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorDescriptorRegistry.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorDescriptorRegistry.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorDescriptorRegistry.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorDescriptorRegistry.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorMultipleBinding.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorMultipleBinding.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorMultipleBinding.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorMultipleBinding.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorMultipleBinding.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorToOperatorBinding.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorToOperatorBinding.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorToOperatorBinding.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorToOperatorBinding.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerOperatorToOperatorBinding.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerStackDescriptorRegistry.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerStackDescriptorRegistry.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerStackDescriptorRegistry.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerStackDescriptorRegistry.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayerStackDescriptorRegistry.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayersStack.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayersStack.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayersStack.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayersStack.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayersStack.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayersStackApplication.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayersStackApplication.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayersStackApplication.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayersStackApplication.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LayersStackApplication.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LineInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LineInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LineInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LineInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LineInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LinePropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LinePropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LinePropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LinePropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LinePropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LineType.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LineType.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LineType.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LineType.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/LineType.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Metamodel.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Metamodel.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Metamodel.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Metamodel.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Metamodel.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/NullInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/NullInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/NullInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/NullInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/NullInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/NullPropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/NullPropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/NullPropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/NullPropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/NullPropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/OperatorBinding.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/OperatorBinding.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/OperatorBinding.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/OperatorBinding.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/OperatorBinding.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/OperatorConfig.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/OperatorConfig.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/OperatorConfig.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/OperatorConfig.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/OperatorConfig.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/OrStackedLayerOperatorDescriptor.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/OrStackedLayerOperatorDescriptor.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/OrStackedLayerOperatorDescriptor.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/OrStackedLayerOperatorDescriptor.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/OrStackedLayerOperatorDescriptor.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Property.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Property.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Property.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Property.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/Property.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertyId.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertyId.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertyId.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertyId.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertyId.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertyIndex.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertyIndex.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertyIndex.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertyIndex.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertyIndex.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertyOperator.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertyOperator.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertyOperator.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertyOperator.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertyOperator.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertyRegistry.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertyRegistry.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertyRegistry.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertyRegistry.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertyRegistry.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertySetterRegistry.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertySetterRegistry.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertySetterRegistry.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertySetterRegistry.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/PropertySetterRegistry.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/RegExpLayer.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/RegExpLayer.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/RegExpLayer.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/RegExpLayer.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/RegExpLayer.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/RegExpLayerDescriptor.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/RegExpLayerDescriptor.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/RegExpLayerDescriptor.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/RegExpLayerDescriptor.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/RegExpLayerDescriptor.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/SimpleBinding.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/SimpleBinding.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/SimpleBinding.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/SimpleBinding.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/SimpleBinding.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/SimpleLayerDescriptor.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/SimpleLayerDescriptor.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/SimpleLayerDescriptor.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/SimpleLayerDescriptor.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/SimpleLayerDescriptor.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StackedLayerOperator.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StackedLayerOperator.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StackedLayerOperator.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StackedLayerOperator.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StackedLayerOperator.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StackedLayerOperatorDescriptor.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StackedLayerOperatorDescriptor.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StackedLayerOperatorDescriptor.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StackedLayerOperatorDescriptor.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StackedLayerOperatorDescriptor.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringInstance.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringInstance.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringInstance.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringInstance.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringInstance.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringToPropertyIndexMap.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringToPropertyIndexMap.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringToPropertyIndexMap.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringToPropertyIndexMap.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringToPropertyIndexMap.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringToPropertySetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringToPropertySetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringToPropertySetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringToPropertySetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringToPropertySetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringToTypeInstanceMap.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringToTypeInstanceMap.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringToTypeInstanceMap.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringToTypeInstanceMap.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringToTypeInstanceMap.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringToTypeMap.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringToTypeMap.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringToTypeMap.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringToTypeMap.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringToTypeMap.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringType.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringType.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringType.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringType.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/StringType.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/TopLayerOperator.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/TopLayerOperator.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/TopLayerOperator.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/TopLayerOperator.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/TopLayerOperator.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/TopLayerOperatorDescriptor.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/TopLayerOperatorDescriptor.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/TopLayerOperatorDescriptor.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/TopLayerOperatorDescriptor.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/TopLayerOperatorDescriptor.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/TypeConfig.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/TypeConfig.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/TypeConfig.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/TypeConfig.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/TypeConfig.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/TypeRegistry.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/TypeRegistry.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/TypeRegistry.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/TypeRegistry.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/TypeRegistry.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/isAbstractUmlSetter.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/isAbstractUmlSetter.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/isAbstractUmlSetter.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/isAbstractUmlSetter.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/icons/full/obj16/isAbstractUmlSetter.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/plugin.properties

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/plugin.properties b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/plugin.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/plugin.properties
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/plugin.properties

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/plugin.xml

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/plugin.xml b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/plugin.xml
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/plugin.xml
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/plugin.xml

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/pom.xml

diff --git a/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/pom.xml b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/pom.xml
new file mode 100755
index 0000000..7a80750
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/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.incubation.layers</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.layers.plugins</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>org.eclipse.papyrus.layers.stackmodel.edit</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	
+</project>
\ No newline at end of file

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/FolderElementItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/FolderElementItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/FolderElementItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/FolderElementItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/FolderElementItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/FolderItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/FolderItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/FolderItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/FolderItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/FolderItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/InstanciableElementItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/InstanciableElementItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/InstanciableElementItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/InstanciableElementItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/InstanciableElementItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/LayerOperatorConfigItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/LayerOperatorConfigItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/LayerOperatorConfigItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/LayerOperatorConfigItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/LayerOperatorConfigItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/LayerOperatorMultipleBindingItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/LayerOperatorMultipleBindingItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/LayerOperatorMultipleBindingItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/LayerOperatorMultipleBindingItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/LayerOperatorMultipleBindingItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/LayersconfigEditPlugin.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/LayersconfigEditPlugin.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/LayersconfigEditPlugin.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/LayersconfigEditPlugin.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/LayersconfigEditPlugin.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/LayersconfigItemProviderAdapterFactory.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/LayersconfigItemProviderAdapterFactory.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/LayersconfigItemProviderAdapterFactory.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/LayersconfigItemProviderAdapterFactory.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/LayersconfigItemProviderAdapterFactory.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/OperatorBindingItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/OperatorBindingItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/OperatorBindingItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/OperatorBindingItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/OperatorBindingItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/OperatorConfigItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/OperatorConfigItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/OperatorConfigItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/OperatorConfigItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/OperatorConfigItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/PropertyIdItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/PropertyIdItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/PropertyIdItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/PropertyIdItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/PropertyIdItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/TypeConfigItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/TypeConfigItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/TypeConfigItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/TypeConfigItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/configmodel/layersconfig/provider/TypeConfigItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/AbstractLayerItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/AbstractLayerItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/AbstractLayerItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/AbstractLayerItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/AbstractLayerItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/AbstractLayerOperatorItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/AbstractLayerOperatorItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/AbstractLayerOperatorItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/AbstractLayerOperatorItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/AbstractLayerOperatorItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/AllViewsDerivedLayerItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/AllViewsDerivedLayerItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/AllViewsDerivedLayerItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/AllViewsDerivedLayerItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/AllViewsDerivedLayerItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/AndStackedLayerOperatorDescriptorItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/AndStackedLayerOperatorDescriptorItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/AndStackedLayerOperatorDescriptorItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/AndStackedLayerOperatorDescriptorItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/AndStackedLayerOperatorDescriptorItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/ApplicationDependantElementItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/ApplicationDependantElementItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/ApplicationDependantElementItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/ApplicationDependantElementItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/ApplicationDependantElementItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/BooleanInstanceItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/BooleanInstanceItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/BooleanInstanceItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/BooleanInstanceItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/BooleanInstanceItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/BooleanTypeItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/BooleanTypeItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/BooleanTypeItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/BooleanTypeItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/BooleanTypeItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/ColorInstanceItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/ColorInstanceItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/ColorInstanceItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/ColorInstanceItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/ColorInstanceItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/ColorItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/ColorItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/ColorItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/ColorItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/ColorItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/CustomLayerOperatorItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/CustomLayerOperatorItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/CustomLayerOperatorItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/CustomLayerOperatorItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/CustomLayerOperatorItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/CustomPropertyOperatorItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/CustomPropertyOperatorItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/CustomPropertyOperatorItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/CustomPropertyOperatorItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/CustomPropertyOperatorItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/CustomTypeItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/CustomTypeItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/CustomTypeItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/CustomTypeItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/CustomTypeItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/DefaultPropertyOperatorItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/DefaultPropertyOperatorItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/DefaultPropertyOperatorItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/DefaultPropertyOperatorItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/DefaultPropertyOperatorItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FillInstanceItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FillInstanceItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FillInstanceItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FillInstanceItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FillInstanceItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FillItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FillItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FillItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FillItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FillItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FillPropertySetterItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FillPropertySetterItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FillPropertySetterItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FillPropertySetterItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FillPropertySetterItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FolderElementItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FolderElementItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FolderElementItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FolderElementItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FolderElementItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FolderItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FolderItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FolderItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FolderItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FolderItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FontInstanceItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FontInstanceItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FontInstanceItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FontInstanceItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FontInstanceItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FontPropertySetterItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FontPropertySetterItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FontPropertySetterItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FontPropertySetterItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FontPropertySetterItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FontTypeItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FontTypeItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FontTypeItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FontTypeItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/FontTypeItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IntInstanceItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IntInstanceItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IntInstanceItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IntInstanceItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IntInstanceItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IntTypeItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IntTypeItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IntTypeItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IntTypeItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IntTypeItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IsAbstractUmlSetterItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IsAbstractUmlSetterItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IsAbstractUmlSetterItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IsAbstractUmlSetterItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IsAbstractUmlSetterItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IsValidPropertySetterItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IsValidPropertySetterItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IsValidPropertySetterItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IsValidPropertySetterItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IsValidPropertySetterItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IsVisiblePropertySetterItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IsVisiblePropertySetterItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IsVisiblePropertySetterItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IsVisiblePropertySetterItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/IsVisiblePropertySetterItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerApplicationFactoryItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerApplicationFactoryItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerApplicationFactoryItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerApplicationFactoryItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerApplicationFactoryItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerDescriptorItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerDescriptorItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerDescriptorItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerDescriptorItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerDescriptorItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerDescriptorRegistryItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerDescriptorRegistryItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerDescriptorRegistryItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerDescriptorRegistryItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerDescriptorRegistryItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerExpressionItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerExpressionItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerExpressionItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerExpressionItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerExpressionItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerNamedStyleItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerNamedStyleItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerNamedStyleItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerNamedStyleItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerNamedStyleItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerOperatorDescriptorItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerOperatorDescriptorItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerOperatorDescriptorItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerOperatorDescriptorItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerOperatorDescriptorItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerOperatorDescriptorRegistryItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerOperatorDescriptorRegistryItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerOperatorDescriptorRegistryItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerOperatorDescriptorRegistryItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerOperatorDescriptorRegistryItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerOperatorItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerOperatorItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerOperatorItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerOperatorItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerOperatorItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerStackDescriptorRegistryItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerStackDescriptorRegistryItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerStackDescriptorRegistryItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerStackDescriptorRegistryItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayerStackDescriptorRegistryItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayersEditPlugin.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayersEditPlugin.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayersEditPlugin.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayersEditPlugin.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayersEditPlugin.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayersItemProviderAdapterFactory.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayersItemProviderAdapterFactory.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayersItemProviderAdapterFactory.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayersItemProviderAdapterFactory.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayersItemProviderAdapterFactory.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayersStackApplicationItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayersStackApplicationItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayersStackApplicationItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayersStackApplicationItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayersStackApplicationItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayersStackItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayersStackItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayersStackItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayersStackItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LayersStackItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LineInstanceItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LineInstanceItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LineInstanceItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LineInstanceItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LineInstanceItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LinePropertySetterItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LinePropertySetterItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LinePropertySetterItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LinePropertySetterItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LinePropertySetterItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LineTypeItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LineTypeItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LineTypeItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LineTypeItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/LineTypeItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/MetamodelItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/MetamodelItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/MetamodelItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/MetamodelItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/MetamodelItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/NullInstanceItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/NullInstanceItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/NullInstanceItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/NullInstanceItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/NullInstanceItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/NullPropertySetterItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/NullPropertySetterItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/NullPropertySetterItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/NullPropertySetterItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/NullPropertySetterItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/OrStackedLayerOperatorDescriptorItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/OrStackedLayerOperatorDescriptorItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/OrStackedLayerOperatorDescriptorItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/OrStackedLayerOperatorDescriptorItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/OrStackedLayerOperatorDescriptorItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertyIndexItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertyIndexItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertyIndexItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertyIndexItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertyIndexItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertyItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertyItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertyItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertyItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertyItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertyOperatorItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertyOperatorItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertyOperatorItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertyOperatorItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertyOperatorItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertyRegistryItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertyRegistryItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertyRegistryItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertyRegistryItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertyRegistryItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertySetterItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertySetterItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertySetterItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertySetterItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertySetterItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertySetterRegistryItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertySetterRegistryItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertySetterRegistryItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertySetterRegistryItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/PropertySetterRegistryItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/RegExpLayerDescriptorItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/RegExpLayerDescriptorItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/RegExpLayerDescriptorItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/RegExpLayerDescriptorItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/RegExpLayerDescriptorItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/RegExpLayerItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/RegExpLayerItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/RegExpLayerItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/RegExpLayerItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/RegExpLayerItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/SimpleLayerDescriptorItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/SimpleLayerDescriptorItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/SimpleLayerDescriptorItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/SimpleLayerDescriptorItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/SimpleLayerDescriptorItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StackedLayerOperatorDescriptorItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StackedLayerOperatorDescriptorItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StackedLayerOperatorDescriptorItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StackedLayerOperatorDescriptorItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StackedLayerOperatorDescriptorItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StackedLayerOperatorItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StackedLayerOperatorItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StackedLayerOperatorItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StackedLayerOperatorItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StackedLayerOperatorItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringInstanceItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringInstanceItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringInstanceItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringInstanceItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringInstanceItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringToPropertyIndexMapItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringToPropertyIndexMapItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringToPropertyIndexMapItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringToPropertyIndexMapItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringToPropertyIndexMapItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringToPropertySetterItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringToPropertySetterItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringToPropertySetterItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringToPropertySetterItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringToPropertySetterItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringToTypeInstanceMapItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringToTypeInstanceMapItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringToTypeInstanceMapItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringToTypeInstanceMapItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringToTypeInstanceMapItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringToTypeMapItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringToTypeMapItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringToTypeMapItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringToTypeMapItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringToTypeMapItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringTypeItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringTypeItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringTypeItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringTypeItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/StringTypeItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TopLayerOperatorDescriptorItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TopLayerOperatorDescriptorItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TopLayerOperatorDescriptorItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TopLayerOperatorDescriptorItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TopLayerOperatorDescriptorItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TopLayerOperatorItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TopLayerOperatorItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TopLayerOperatorItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TopLayerOperatorItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TopLayerOperatorItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TypeInstanceItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TypeInstanceItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TypeInstanceItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TypeInstanceItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TypeInstanceItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TypeItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TypeItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TypeItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TypeItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TypeItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TypeRegistryItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TypeRegistryItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TypeRegistryItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TypeRegistryItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/TypeRegistryItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/AbstractLayerItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/AbstractLayerItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/AbstractLayerItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/AbstractLayerItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/AbstractLayerItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/AllViewsDerivedLayerItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/AllViewsDerivedLayerItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/AllViewsDerivedLayerItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/AllViewsDerivedLayerItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/AllViewsDerivedLayerItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/CustomLayersItemProviderAdapterFactory.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/CustomLayersItemProviderAdapterFactory.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/CustomLayersItemProviderAdapterFactory.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/CustomLayersItemProviderAdapterFactory.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/CustomLayersItemProviderAdapterFactory.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/LayerItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/LayerItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/LayerItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/LayerItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/LayerItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/LayersStackApplicationItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/LayersStackApplicationItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/LayersStackApplicationItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/LayersStackApplicationItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/LayersStackApplicationItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/RegExpLayerItemProvider.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/RegExpLayerItemProvider.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/RegExpLayerItemProvider.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/RegExpLayerItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.edit/src/org/eclipse/papyrus/layers/stackmodel/layers/provider/custom/RegExpLayerItemProvider.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/.classpath

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/.classpath b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/.classpath
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.editor/.classpath
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/.classpath

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/.project

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/.project b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/.project
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.editor/.project
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/.project

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/.settings/org.eclipse.jdt.core.prefs

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/.settings/org.eclipse.jdt.core.prefs b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.editor/.settings/org.eclipse.jdt.core.prefs
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/.settings/org.eclipse.jdt.core.prefs

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/.settings/org.eclipse.jdt.ui.prefs

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/.settings/org.eclipse.jdt.ui.prefs b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.editor/.settings/org.eclipse.jdt.ui.prefs
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/.settings/org.eclipse.jdt.ui.prefs

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/META-INF/MANIFEST.MF

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/META-INF/MANIFEST.MF b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/META-INF/MANIFEST.MF
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.editor/META-INF/MANIFEST.MF
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/META-INF/MANIFEST.MF

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/about.html

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/about.html b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/about.html
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.editor/about.html
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/about.html

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/build.properties

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/build.properties b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/build.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.editor/build.properties
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/build.properties

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/icons/full/obj16/LayersModelFile.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/icons/full/obj16/LayersModelFile.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/icons/full/obj16/LayersModelFile.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.editor/icons/full/obj16/LayersModelFile.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/icons/full/obj16/LayersModelFile.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/icons/full/obj16/LayersconfigModelFile.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/icons/full/obj16/LayersconfigModelFile.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/icons/full/obj16/LayersconfigModelFile.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.editor/icons/full/obj16/LayersconfigModelFile.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/icons/full/obj16/LayersconfigModelFile.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/icons/full/wizban/NewLayers.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/icons/full/wizban/NewLayers.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/icons/full/wizban/NewLayers.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.editor/icons/full/wizban/NewLayers.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/icons/full/wizban/NewLayers.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/icons/full/wizban/NewLayersconfig.gif

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/icons/full/wizban/NewLayersconfig.gif b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/icons/full/wizban/NewLayersconfig.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.editor/icons/full/wizban/NewLayersconfig.gif
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/icons/full/wizban/NewLayersconfig.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/plugin.properties

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/plugin.properties b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/plugin.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.editor/plugin.properties
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/plugin.properties
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/plugin.xml

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/plugin.xml b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/plugin.xml
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.editor/plugin.xml
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/plugin.xml

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/pom.xml

diff --git a/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/pom.xml b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/pom.xml
new file mode 100755
index 0000000..5f6d8ff
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/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.incubation.layers</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.layers.plugins</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.layers.stackmodel.editor</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	
+</project>
\ No newline at end of file

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/configmodel/layersconfig/presentation/LayersconfigActionBarContributor.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/configmodel/layersconfig/presentation/LayersconfigActionBarContributor.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/configmodel/layersconfig/presentation/LayersconfigActionBarContributor.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/configmodel/layersconfig/presentation/LayersconfigActionBarContributor.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/configmodel/layersconfig/presentation/LayersconfigActionBarContributor.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/configmodel/layersconfig/presentation/LayersconfigEditor.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/configmodel/layersconfig/presentation/LayersconfigEditor.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/configmodel/layersconfig/presentation/LayersconfigEditor.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/configmodel/layersconfig/presentation/LayersconfigEditor.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/configmodel/layersconfig/presentation/LayersconfigEditor.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/configmodel/layersconfig/presentation/LayersconfigEditorPlugin.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/configmodel/layersconfig/presentation/LayersconfigEditorPlugin.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/configmodel/layersconfig/presentation/LayersconfigEditorPlugin.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/configmodel/layersconfig/presentation/LayersconfigEditorPlugin.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/configmodel/layersconfig/presentation/LayersconfigEditorPlugin.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/configmodel/layersconfig/presentation/LayersconfigModelWizard.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/configmodel/layersconfig/presentation/LayersconfigModelWizard.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/configmodel/layersconfig/presentation/LayersconfigModelWizard.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/configmodel/layersconfig/presentation/LayersconfigModelWizard.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/configmodel/layersconfig/presentation/LayersconfigModelWizard.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/stackmodel/layers/presentation/LayersActionBarContributor.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/stackmodel/layers/presentation/LayersActionBarContributor.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/stackmodel/layers/presentation/LayersActionBarContributor.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/stackmodel/layers/presentation/LayersActionBarContributor.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/stackmodel/layers/presentation/LayersActionBarContributor.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/stackmodel/layers/presentation/LayersEditor.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/stackmodel/layers/presentation/LayersEditor.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/stackmodel/layers/presentation/LayersEditor.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/stackmodel/layers/presentation/LayersEditor.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/stackmodel/layers/presentation/LayersEditor.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/stackmodel/layers/presentation/LayersEditorPlugin.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/stackmodel/layers/presentation/LayersEditorPlugin.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/stackmodel/layers/presentation/LayersEditorPlugin.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/stackmodel/layers/presentation/LayersEditorPlugin.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/stackmodel/layers/presentation/LayersEditorPlugin.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/stackmodel/layers/presentation/LayersModelWizard.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/stackmodel/layers/presentation/LayersModelWizard.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/stackmodel/layers/presentation/LayersModelWizard.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/stackmodel/layers/presentation/LayersModelWizard.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel.editor/src/org/eclipse/papyrus/layers/stackmodel/layers/presentation/LayersModelWizard.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/.classpath

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/.classpath b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/.classpath
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/.classpath
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/.classpath

layers/plugins/org.eclipse.papyrus.layers.stackmodel/.project

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/.project b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/.project
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/.project
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/.project

layers/plugins/org.eclipse.papyrus.layers.stackmodel/.settings/org.eclipse.jdt.core.prefs

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/.settings/org.eclipse.jdt.core.prefs b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/.settings/org.eclipse.jdt.core.prefs
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/.settings/org.eclipse.jdt.core.prefs

layers/plugins/org.eclipse.papyrus.layers.stackmodel/.settings/org.eclipse.jdt.ui.prefs

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/.settings/org.eclipse.jdt.ui.prefs b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/.settings/org.eclipse.jdt.ui.prefs
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/.settings/org.eclipse.jdt.ui.prefs

layers/plugins/org.eclipse.papyrus.layers.stackmodel/META-INF/MANIFEST.MF

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/META-INF/MANIFEST.MF b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/META-INF/MANIFEST.MF
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/META-INF/MANIFEST.MF
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/META-INF/MANIFEST.MF

layers/plugins/org.eclipse.papyrus.layers.stackmodel/about.html

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/about.html b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/about.html
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/about.html
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/about.html

layers/plugins/org.eclipse.papyrus.layers.stackmodel/build.properties

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/build.properties b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/build.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/build.properties
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/build.properties

layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layers.di

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/model/layers.di b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layers.di
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/model/layers.di
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layers.di

layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layers.ecore

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/model/layers.ecore b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layers.ecore
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/model/layers.ecore
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layers.ecore

layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layers.genmodel

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/model/layers.genmodel b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layers.genmodel
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/model/layers.genmodel
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layers.genmodel

layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layers.notation

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/model/layers.notation b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layers.notation
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/model/layers.notation
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layers.notation

layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layers.uml

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/model/layers.uml b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layers.uml
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/model/layers.uml
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layers.uml

layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.di

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.di b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.di
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.di
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.di

layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.ecore

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.ecore b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.ecore
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.ecore
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.ecore

layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.genmodel

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.genmodel b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.genmodel
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.genmodel
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.genmodel

layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.notation

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.notation b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.notation
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.notation
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.notation

layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.uml

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.uml b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.uml
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.uml
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/layersconfig.uml

layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/notation/ecore.uml

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/model/notation/ecore.uml b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/notation/ecore.uml
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/model/notation/ecore.uml
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/notation/ecore.uml

layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/notation/notation.di

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/model/notation/notation.di b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/notation/notation.di
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/model/notation/notation.di
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/notation/notation.di

layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/notation/notation.ecore

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/model/notation/notation.ecore b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/notation/notation.ecore
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/model/notation/notation.ecore
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/notation/notation.ecore

layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/notation/notation.notation

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/model/notation/notation.notation b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/notation/notation.notation
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/model/notation/notation.notation
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/notation/notation.notation

layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/notation/notation.uml

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/model/notation/notation.uml b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/notation/notation.uml
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/model/notation/notation.uml
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/model/notation/notation.uml

layers/plugins/org.eclipse.papyrus.layers.stackmodel/plugin.properties

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/plugin.properties b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/plugin.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/plugin.properties
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/plugin.properties

layers/plugins/org.eclipse.papyrus.layers.stackmodel/plugin.xml

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/plugin.xml b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/plugin.xml
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/plugin.xml
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/plugin.xml

layers/plugins/org.eclipse.papyrus.layers.stackmodel/pom.xml

diff --git a/layers/plugins/org.eclipse.papyrus.layers.stackmodel/pom.xml b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/pom.xml
new file mode 100755
index 0000000..a17eee8
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/pom.xml
@@ -0,0 +1,16 @@
+<?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.incubation.layers</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.layers.plugins</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>org.eclipse.papyrus.layers.stackmodel</artifactId>
+	<version>1.3.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+	
+</project>
\ No newline at end of file

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/ClassnameKind.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/ClassnameKind.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/ClassnameKind.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/ClassnameKind.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/ClassnameKind.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/Folder.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/Folder.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/Folder.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/Folder.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/Folder.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/FolderElement.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/FolderElement.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/FolderElement.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/FolderElement.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/FolderElement.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/InstanciableElement.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/InstanciableElement.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/InstanciableElement.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/InstanciableElement.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/InstanciableElement.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayerOperatorConfig.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayerOperatorConfig.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayerOperatorConfig.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayerOperatorConfig.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayerOperatorConfig.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayerOperatorMultipleBinding.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayerOperatorMultipleBinding.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayerOperatorMultipleBinding.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayerOperatorMultipleBinding.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayerOperatorMultipleBinding.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayerOperatorToOperatorBinding.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayerOperatorToOperatorBinding.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayerOperatorToOperatorBinding.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayerOperatorToOperatorBinding.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayerOperatorToOperatorBinding.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayersOperatorBinding.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayersOperatorBinding.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayersOperatorBinding.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayersOperatorBinding.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayersOperatorBinding.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayersconfigFactory.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayersconfigFactory.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayersconfigFactory.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayersconfigFactory.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayersconfigFactory.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayersconfigPackage.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayersconfigPackage.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayersconfigPackage.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayersconfigPackage.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/LayersconfigPackage.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/OperatorBinding.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/OperatorBinding.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/OperatorBinding.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/OperatorBinding.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/OperatorBinding.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/OperatorConfig.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/OperatorConfig.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/OperatorConfig.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/OperatorConfig.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/OperatorConfig.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/PropertyId.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/PropertyId.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/PropertyId.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/PropertyId.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/PropertyId.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/SimpleBinding.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/SimpleBinding.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/SimpleBinding.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/SimpleBinding.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/SimpleBinding.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/TypeConfig.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/TypeConfig.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/TypeConfig.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/TypeConfig.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/TypeConfig.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/FolderElementImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/FolderElementImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/FolderElementImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/FolderElementImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/FolderElementImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/FolderImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/FolderImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/FolderImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/FolderImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/FolderImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/InstanciableElementImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/InstanciableElementImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/InstanciableElementImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/InstanciableElementImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/InstanciableElementImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayerOperatorConfigImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayerOperatorConfigImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayerOperatorConfigImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayerOperatorConfigImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayerOperatorConfigImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayerOperatorMultipleBindingImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayerOperatorMultipleBindingImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayerOperatorMultipleBindingImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayerOperatorMultipleBindingImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayerOperatorMultipleBindingImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayersconfigFactoryImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayersconfigFactoryImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayersconfigFactoryImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayersconfigFactoryImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayersconfigFactoryImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayersconfigPackageImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayersconfigPackageImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayersconfigPackageImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayersconfigPackageImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayersconfigPackageImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/OperatorBindingImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/OperatorBindingImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/OperatorBindingImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/OperatorBindingImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/OperatorBindingImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/OperatorConfigImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/OperatorConfigImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/OperatorConfigImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/OperatorConfigImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/OperatorConfigImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/PropertyIdImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/PropertyIdImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/PropertyIdImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/PropertyIdImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/PropertyIdImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/TypeConfigImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/TypeConfigImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/TypeConfigImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/TypeConfigImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/TypeConfigImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/util/LayersconfigAdapterFactory.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/util/LayersconfigAdapterFactory.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/util/LayersconfigAdapterFactory.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/util/LayersconfigAdapterFactory.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/util/LayersconfigAdapterFactory.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/util/LayersconfigSwitch.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/util/LayersconfigSwitch.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/util/LayersconfigSwitch.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/util/LayersconfigSwitch.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/configmodel/layersconfig/util/LayersconfigSwitch.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/Activator.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/Activator.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/Activator.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/Activator.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/Activator.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/BadStateException.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/BadStateException.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/BadStateException.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/BadStateException.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/BadStateException.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/InstanciationException.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/InstanciationException.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/InstanciationException.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/InstanciationException.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/InstanciationException.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/LayersException.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/LayersException.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/LayersException.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/LayersException.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/LayersException.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/NotFoundException.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/NotFoundException.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/NotFoundException.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/NotFoundException.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/NotFoundException.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/PropertyValueFactory.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/PropertyValueFactory.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/PropertyValueFactory.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/PropertyValueFactory.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/PropertyValueFactory.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/command/ComputePropertyValueCommand.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/command/ComputePropertyValueCommand.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/command/ComputePropertyValueCommand.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/command/ComputePropertyValueCommand.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/command/ComputePropertyValueCommand.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ExpressionMatcher.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ExpressionMatcher.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ExpressionMatcher.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ExpressionMatcher.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ExpressionMatcher.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/exprmatcher/IValueChangedEventListener.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/exprmatcher/IValueChangedEventListener.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/exprmatcher/IValueChangedEventListener.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/exprmatcher/IValueChangedEventListener.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/exprmatcher/IValueChangedEventListener.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ValueChangedEventNotifier.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ValueChangedEventNotifier.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ValueChangedEventNotifier.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ValueChangedEventNotifier.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ValueChangedEventNotifier.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ValueChangedEventNotifierFactory.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ValueChangedEventNotifierFactory.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ValueChangedEventNotifierFactory.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ValueChangedEventNotifierFactory.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ValueChangedEventNotifierFactory.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/AbstractLayer.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/AbstractLayer.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/AbstractLayer.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/AbstractLayer.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/AbstractLayer.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/AbstractLayerOperator.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/AbstractLayerOperator.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/AbstractLayerOperator.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/AbstractLayerOperator.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/AbstractLayerOperator.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/AllViewsDerivedLayer.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/AllViewsDerivedLayer.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/AllViewsDerivedLayer.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/AllViewsDerivedLayer.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/AllViewsDerivedLayer.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/AndStackedLayerOperatorDescriptor.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/AndStackedLayerOperatorDescriptor.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/AndStackedLayerOperatorDescriptor.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/AndStackedLayerOperatorDescriptor.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/AndStackedLayerOperatorDescriptor.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/ApplicationDependantElement.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/ApplicationDependantElement.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/ApplicationDependantElement.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/ApplicationDependantElement.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/ApplicationDependantElement.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/BooleanInstance.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/BooleanInstance.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/BooleanInstance.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/BooleanInstance.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/BooleanInstance.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/BooleanPropertyValue.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/BooleanPropertyValue.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/BooleanPropertyValue.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/BooleanPropertyValue.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/BooleanPropertyValue.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/BooleanType.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/BooleanType.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/BooleanType.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/BooleanType.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/BooleanType.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/BooleanValue.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/BooleanValue.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/BooleanValue.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/BooleanValue.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/BooleanValue.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Color.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Color.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Color.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Color.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Color.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/ColorInstance.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/ColorInstance.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/ColorInstance.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/ColorInstance.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/ColorInstance.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/CustomLayerOperator.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/CustomLayerOperator.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/CustomLayerOperator.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/CustomLayerOperator.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/CustomLayerOperator.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/CustomPropertyOperator.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/CustomPropertyOperator.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/CustomPropertyOperator.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/CustomPropertyOperator.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/CustomPropertyOperator.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/CustomType.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/CustomType.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/CustomType.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/CustomType.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/CustomType.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/DefaultPropertyOperator.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/DefaultPropertyOperator.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/DefaultPropertyOperator.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/DefaultPropertyOperator.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/DefaultPropertyOperator.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/EventLevel.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/EventLevel.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/EventLevel.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/EventLevel.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/EventLevel.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Fill.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Fill.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Fill.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Fill.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Fill.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FillInstance.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FillInstance.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FillInstance.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FillInstance.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FillInstance.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FillPropertySetter.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FillPropertySetter.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FillPropertySetter.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FillPropertySetter.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FillPropertySetter.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Folder.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Folder.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Folder.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Folder.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Folder.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FolderElement.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FolderElement.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FolderElement.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FolderElement.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FolderElement.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FontInstance.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FontInstance.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FontInstance.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FontInstance.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FontInstance.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FontPropertySetter.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FontPropertySetter.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FontPropertySetter.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FontPropertySetter.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FontPropertySetter.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FontType.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FontType.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FontType.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FontType.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/FontType.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IntInstance.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IntInstance.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IntInstance.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IntInstance.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IntInstance.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IntPropertyValue.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IntPropertyValue.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IntPropertyValue.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IntPropertyValue.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IntPropertyValue.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IntType.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IntType.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IntType.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IntType.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IntType.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IntValue.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IntValue.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IntValue.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IntValue.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IntValue.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IsAbstractUmlSetter.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IsAbstractUmlSetter.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IsAbstractUmlSetter.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IsAbstractUmlSetter.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IsAbstractUmlSetter.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IsValidPropertySetter.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IsValidPropertySetter.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IsValidPropertySetter.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IsValidPropertySetter.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IsValidPropertySetter.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IsVisiblePropertySetter.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IsVisiblePropertySetter.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IsVisiblePropertySetter.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IsVisiblePropertySetter.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/IsVisiblePropertySetter.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Layer.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Layer.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Layer.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Layer.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Layer.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerApplicationFactory.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerApplicationFactory.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerApplicationFactory.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerApplicationFactory.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerApplicationFactory.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerDescriptor.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerDescriptor.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerDescriptor.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerDescriptor.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerDescriptor.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerDescriptorRegistry.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerDescriptorRegistry.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerDescriptorRegistry.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerDescriptorRegistry.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerDescriptorRegistry.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerExpression.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerExpression.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerExpression.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerExpression.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerExpression.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerNamedStyle.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerNamedStyle.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerNamedStyle.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerNamedStyle.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerNamedStyle.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerOperator.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerOperator.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerOperator.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerOperator.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerOperator.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerOperatorDescriptor.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerOperatorDescriptor.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerOperatorDescriptor.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerOperatorDescriptor.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerOperatorDescriptor.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerOperatorDescriptorRegistry.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerOperatorDescriptorRegistry.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerOperatorDescriptorRegistry.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerOperatorDescriptorRegistry.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerOperatorDescriptorRegistry.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerStackDescriptorRegistry.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerStackDescriptorRegistry.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerStackDescriptorRegistry.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerStackDescriptorRegistry.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerStackDescriptorRegistry.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerState.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerState.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerState.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerState.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayerState.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersContainer.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersContainer.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersContainer.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersContainer.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersContainer.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersFactory.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersFactory.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersFactory.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersFactory.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersFactory.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersFactoryForStack.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersFactoryForStack.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersFactoryForStack.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersFactoryForStack.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersFactoryForStack.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersPackage.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersPackage.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersPackage.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersPackage.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersPackage.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersStack.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersStack.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersStack.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersStack.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersStack.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersStackApplication.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersStackApplication.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersStackApplication.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersStackApplication.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LayersStackApplication.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LineInstance.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LineInstance.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LineInstance.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LineInstance.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LineInstance.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LinePropertySetter.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LinePropertySetter.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LinePropertySetter.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LinePropertySetter.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LinePropertySetter.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LineType.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LineType.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LineType.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LineType.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/LineType.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Metamodel.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Metamodel.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Metamodel.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Metamodel.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Metamodel.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/NullInstance.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/NullInstance.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/NullInstance.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/NullInstance.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/NullInstance.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/NullPropertySetter.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/NullPropertySetter.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/NullPropertySetter.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/NullPropertySetter.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/NullPropertySetter.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/OrStackedLayerOperatorDescriptor.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/OrStackedLayerOperatorDescriptor.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/OrStackedLayerOperatorDescriptor.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/OrStackedLayerOperatorDescriptor.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/OrStackedLayerOperatorDescriptor.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Package.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Package.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Package.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Package.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Package.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PackageableElement.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PackageableElement.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PackageableElement.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PackageableElement.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PackageableElement.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Property.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Property.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Property.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Property.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Property.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyDescriptor.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyDescriptor.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyDescriptor.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyDescriptor.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyDescriptor.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyIndex.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyIndex.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyIndex.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyIndex.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyIndex.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyOperator.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyOperator.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyOperator.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyOperator.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyOperator.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyRegistry.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyRegistry.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyRegistry.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyRegistry.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyRegistry.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertySetter.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertySetter.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertySetter.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertySetter.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertySetter.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertySetterRegistry.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertySetterRegistry.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertySetterRegistry.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertySetterRegistry.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertySetterRegistry.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyValue.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyValue.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyValue.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyValue.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/PropertyValue.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/RegExpLayer.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/RegExpLayer.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/RegExpLayer.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/RegExpLayer.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/RegExpLayer.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/RegExpLayerDescriptor.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/RegExpLayerDescriptor.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/RegExpLayerDescriptor.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/RegExpLayerDescriptor.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/RegExpLayerDescriptor.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/SimpleLayerDescriptor.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/SimpleLayerDescriptor.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/SimpleLayerDescriptor.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/SimpleLayerDescriptor.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/SimpleLayerDescriptor.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StackedLayerOperator.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StackedLayerOperator.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StackedLayerOperator.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StackedLayerOperator.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StackedLayerOperator.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StackedLayerOperatorDescriptor.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StackedLayerOperatorDescriptor.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StackedLayerOperatorDescriptor.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StackedLayerOperatorDescriptor.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StackedLayerOperatorDescriptor.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringInstance.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringInstance.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringInstance.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringInstance.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringInstance.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringPropertyValue.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringPropertyValue.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringPropertyValue.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringPropertyValue.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringPropertyValue.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringToTypeInstanceMap.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringToTypeInstanceMap.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringToTypeInstanceMap.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringToTypeInstanceMap.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringToTypeInstanceMap.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringType.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringType.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringType.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringType.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringType.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringValue.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringValue.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringValue.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringValue.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/StringValue.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/TopLayerOperator.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/TopLayerOperator.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/TopLayerOperator.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/TopLayerOperator.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/TopLayerOperator.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/TopLayerOperatorDescriptor.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/TopLayerOperatorDescriptor.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/TopLayerOperatorDescriptor.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/TopLayerOperatorDescriptor.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/TopLayerOperatorDescriptor.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Type.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Type.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Type.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Type.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/Type.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/TypeInstance.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/TypeInstance.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/TypeInstance.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/TypeInstance.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/TypeInstance.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/TypeRegistry.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/TypeRegistry.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/TypeRegistry.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/TypeRegistry.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/TypeRegistry.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/AbstractLayerImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/AbstractLayerImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/AbstractLayerImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/AbstractLayerImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/AbstractLayerImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/AbstractLayerOperatorImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/AbstractLayerOperatorImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/AbstractLayerOperatorImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/AbstractLayerOperatorImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/AbstractLayerOperatorImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/AllViewsDerivedLayerImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/AllViewsDerivedLayerImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/AllViewsDerivedLayerImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/AllViewsDerivedLayerImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/AllViewsDerivedLayerImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/AndStackedLayerOperatorDescriptorImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/AndStackedLayerOperatorDescriptorImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/AndStackedLayerOperatorDescriptorImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/AndStackedLayerOperatorDescriptorImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/AndStackedLayerOperatorDescriptorImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/ApplicationDependantElementImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/ApplicationDependantElementImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/ApplicationDependantElementImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/ApplicationDependantElementImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/ApplicationDependantElementImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/BooleanInstanceImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/BooleanInstanceImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/BooleanInstanceImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/BooleanInstanceImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/BooleanInstanceImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/BooleanTypeImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/BooleanTypeImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/BooleanTypeImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/BooleanTypeImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/BooleanTypeImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/ColorImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/ColorImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/ColorImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/ColorImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/ColorImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/ColorInstanceImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/ColorInstanceImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/ColorInstanceImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/ColorInstanceImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/ColorInstanceImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/CustomLayerOperatorImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/CustomLayerOperatorImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/CustomLayerOperatorImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/CustomLayerOperatorImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/CustomLayerOperatorImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/CustomPropertyOperatorImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/CustomPropertyOperatorImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/CustomPropertyOperatorImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/CustomPropertyOperatorImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/CustomPropertyOperatorImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/CustomTypeImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/CustomTypeImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/CustomTypeImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/CustomTypeImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/CustomTypeImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/DefaultPropertyOperatorImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/DefaultPropertyOperatorImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/DefaultPropertyOperatorImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/DefaultPropertyOperatorImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/DefaultPropertyOperatorImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FillImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FillImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FillImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FillImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FillImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FillInstanceImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FillInstanceImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FillInstanceImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FillInstanceImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FillInstanceImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FillPropertySetterImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FillPropertySetterImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FillPropertySetterImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FillPropertySetterImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FillPropertySetterImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FolderElementImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FolderElementImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FolderElementImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FolderElementImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FolderElementImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FolderImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FolderImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FolderImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FolderImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FolderImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FontInstanceImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FontInstanceImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FontInstanceImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FontInstanceImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FontInstanceImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FontPropertySetterImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FontPropertySetterImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FontPropertySetterImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FontPropertySetterImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FontPropertySetterImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FontTypeImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FontTypeImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FontTypeImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FontTypeImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/FontTypeImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IntInstanceImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IntInstanceImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IntInstanceImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IntInstanceImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IntInstanceImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IntTypeImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IntTypeImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IntTypeImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IntTypeImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IntTypeImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IsAbstractUmlSetterImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IsAbstractUmlSetterImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IsAbstractUmlSetterImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IsAbstractUmlSetterImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IsAbstractUmlSetterImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IsValidPropertySetterImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IsValidPropertySetterImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IsValidPropertySetterImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IsValidPropertySetterImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IsValidPropertySetterImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IsVisiblePropertySetterImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IsVisiblePropertySetterImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IsVisiblePropertySetterImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IsVisiblePropertySetterImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/IsVisiblePropertySetterImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerApplicationFactoryImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerApplicationFactoryImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerApplicationFactoryImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerApplicationFactoryImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerApplicationFactoryImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerDescriptorImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerDescriptorImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerDescriptorImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerDescriptorImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerDescriptorImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerDescriptorRegistryImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerDescriptorRegistryImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerDescriptorRegistryImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerDescriptorRegistryImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerDescriptorRegistryImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerExpressionImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerExpressionImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerExpressionImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerExpressionImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerExpressionImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerNamedStyleImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerNamedStyleImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerNamedStyleImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerNamedStyleImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerNamedStyleImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorDescriptorImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorDescriptorImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorDescriptorImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorDescriptorImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorDescriptorImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorDescriptorRegistryImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorDescriptorRegistryImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorDescriptorRegistryImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorDescriptorRegistryImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorDescriptorRegistryImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerStackDescriptorRegistryImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerStackDescriptorRegistryImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerStackDescriptorRegistryImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerStackDescriptorRegistryImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerStackDescriptorRegistryImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersFactoryForStackImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersFactoryForStackImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersFactoryForStackImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersFactoryForStackImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersFactoryForStackImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersFactoryImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersFactoryImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersFactoryImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersFactoryImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersFactoryImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersPackageImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersPackageImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersPackageImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersPackageImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersPackageImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersStackApplicationImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersStackApplicationImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersStackApplicationImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersStackApplicationImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersStackApplicationImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersStackImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersStackImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersStackImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersStackImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersStackImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LineInstanceImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LineInstanceImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LineInstanceImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LineInstanceImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LineInstanceImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LinePropertySetterImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LinePropertySetterImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LinePropertySetterImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LinePropertySetterImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LinePropertySetterImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LineTypeImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LineTypeImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LineTypeImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LineTypeImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/LineTypeImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/MetamodelImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/MetamodelImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/MetamodelImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/MetamodelImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/MetamodelImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/NullInstanceImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/NullInstanceImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/NullInstanceImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/NullInstanceImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/NullInstanceImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/NullPropertySetterImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/NullPropertySetterImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/NullPropertySetterImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/NullPropertySetterImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/NullPropertySetterImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/OrStackedLayerOperatorDescriptorImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/OrStackedLayerOperatorDescriptorImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/OrStackedLayerOperatorDescriptorImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/OrStackedLayerOperatorDescriptorImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/OrStackedLayerOperatorDescriptorImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyIndexImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyIndexImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyIndexImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyIndexImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyIndexImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyOperatorImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyOperatorImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyOperatorImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyOperatorImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyOperatorImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyRegistryImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyRegistryImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyRegistryImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyRegistryImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyRegistryImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertySetterImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertySetterImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertySetterImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertySetterImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertySetterImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertySetterRegistryImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertySetterRegistryImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertySetterRegistryImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertySetterRegistryImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertySetterRegistryImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/RegExpLayerDescriptorImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/RegExpLayerDescriptorImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/RegExpLayerDescriptorImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/RegExpLayerDescriptorImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/RegExpLayerDescriptorImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/RegExpLayerImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/RegExpLayerImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/RegExpLayerImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/RegExpLayerImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/RegExpLayerImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/SimpleLayerDescriptorImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/SimpleLayerDescriptorImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/SimpleLayerDescriptorImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/SimpleLayerDescriptorImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/SimpleLayerDescriptorImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorDescriptorImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorDescriptorImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorDescriptorImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorDescriptorImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorDescriptorImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringInstanceImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringInstanceImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringInstanceImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringInstanceImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringInstanceImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringToPropertyIndexMapImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringToPropertyIndexMapImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringToPropertyIndexMapImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringToPropertyIndexMapImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringToPropertyIndexMapImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringToPropertySetterImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringToPropertySetterImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringToPropertySetterImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringToPropertySetterImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringToPropertySetterImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringToTypeInstanceMapImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringToTypeInstanceMapImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringToTypeInstanceMapImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringToTypeInstanceMapImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringToTypeInstanceMapImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringToTypeMapImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringToTypeMapImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringToTypeMapImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringToTypeMapImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringToTypeMapImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringTypeImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringTypeImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringTypeImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringTypeImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringTypeImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TopLayerOperatorDescriptorImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TopLayerOperatorDescriptorImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TopLayerOperatorDescriptorImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TopLayerOperatorDescriptorImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TopLayerOperatorDescriptorImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TopLayerOperatorImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TopLayerOperatorImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TopLayerOperatorImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TopLayerOperatorImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TopLayerOperatorImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TypeImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TypeImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TypeImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TypeImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TypeImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TypeInstanceImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TypeInstanceImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TypeInstanceImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TypeInstanceImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TypeInstanceImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TypeRegistryImpl.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TypeRegistryImpl.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TypeRegistryImpl.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TypeRegistryImpl.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/impl/TypeRegistryImpl.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/ILayerOperatorDescriptorRegistryLoader.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/ILayerOperatorDescriptorRegistryLoader.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/ILayerOperatorDescriptorRegistryLoader.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/ILayerOperatorDescriptorRegistryLoader.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/ILayerOperatorDescriptorRegistryLoader.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayerOperatorDescriptorRegistryLoader.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayerOperatorDescriptorRegistryLoader.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayerOperatorDescriptorRegistryLoader.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayerOperatorDescriptorRegistryLoader.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayerOperatorDescriptorRegistryLoader.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayersConfigModel.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayersConfigModel.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayersConfigModel.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayersConfigModel.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayersConfigModel.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayersConfigModelUtils.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayersConfigModelUtils.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayersConfigModelUtils.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayersConfigModelUtils.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayersConfigModelUtils.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/RegistriesLoader.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/RegistriesLoader.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/RegistriesLoader.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/RegistriesLoader.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/loaders/RegistriesLoader.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/ECoreUtils.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/ECoreUtils.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/ECoreUtils.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/ECoreUtils.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/ECoreUtils.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/LayersAdapterFactory.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/LayersAdapterFactory.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/LayersAdapterFactory.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/LayersAdapterFactory.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/LayersAdapterFactory.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/LayersSwitch.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/LayersSwitch.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/LayersSwitch.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/LayersSwitch.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/LayersSwitch.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/PropertyIndexedList.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/PropertyIndexedList.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/PropertyIndexedList.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/PropertyIndexedList.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/PropertyIndexedList.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/PropertyUtils.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/PropertyUtils.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/PropertyUtils.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/PropertyUtils.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/layers/util/PropertyUtils.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewChangedEventNotifier.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewChangedEventNotifier.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewChangedEventNotifier.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewChangedEventNotifier.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewChangedEventNotifier.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewChangedEventNotifierFactory.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewChangedEventNotifierFactory.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewChangedEventNotifierFactory.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewChangedEventNotifierFactory.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewChangedEventNotifierFactory.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewEventNotifier.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewEventNotifier.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewEventNotifier.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewEventNotifier.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewEventNotifier.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/IDiagramViewEventListener.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/IDiagramViewEventListener.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/IDiagramViewEventListener.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/IDiagramViewEventListener.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/IDiagramViewEventListener.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/ILayersTreeEventListener.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/ILayersTreeEventListener.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/ILayersTreeEventListener.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/ILayersTreeEventListener.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/ILayersTreeEventListener.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/IUmlNamedElementChangedEventListener.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/IUmlNamedElementChangedEventListener.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/IUmlNamedElementChangedEventListener.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/IUmlNamedElementChangedEventListener.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/IUmlNamedElementChangedEventListener.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/LayersTreeEventNotifier.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/LayersTreeEventNotifier.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/LayersTreeEventNotifier.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/LayersTreeEventNotifier.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/LayersTreeEventNotifier.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/LayersTreeEventNotifierFactory.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/LayersTreeEventNotifierFactory.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/LayersTreeEventNotifierFactory.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/LayersTreeEventNotifierFactory.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/LayersTreeEventNotifierFactory.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifier.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifier.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifier.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifier.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifier.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifierFactory.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifierFactory.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifierFactory.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifierFactory.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifierFactory.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/package-info.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/package-info.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/package-info.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/package-info.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/notifier/package-info.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/operators/BooleanAndOperator.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/operators/BooleanAndOperator.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/operators/BooleanAndOperator.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/operators/BooleanAndOperator.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/operators/BooleanAndOperator.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/operators/BooleanOrOperator.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/operators/BooleanOrOperator.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/operators/BooleanOrOperator.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/operators/BooleanOrOperator.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/operators/BooleanOrOperator.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/operators/CustomPropertyOperatorsInstance.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/operators/CustomPropertyOperatorsInstance.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/operators/CustomPropertyOperatorsInstance.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/operators/CustomPropertyOperatorsInstance.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/operators/CustomPropertyOperatorsInstance.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/operators/FillAverageOperator.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/operators/FillAverageOperator.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/operators/FillAverageOperator.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/operators/FillAverageOperator.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/operators/FillAverageOperator.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/util/Collections3.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/util/Collections3.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/util/Collections3.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/util/Collections3.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/util/Collections3.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/util/DiagramViewToListSynchronizer.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/util/DiagramViewToListSynchronizer.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/util/DiagramViewToListSynchronizer.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/util/DiagramViewToListSynchronizer.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/util/DiagramViewToListSynchronizer.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/util/LayerDiagramViewPredicate.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/util/LayerDiagramViewPredicate.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/util/LayerDiagramViewPredicate.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/util/LayerDiagramViewPredicate.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/util/LayerDiagramViewPredicate.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/util/ObservableListView.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/util/ObservableListView.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/util/ObservableListView.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/util/ObservableListView.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/src/org/eclipse/papyrus/layers/stackmodel/util/ObservableListView.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/models/model1.notation

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/models/model1.notation b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/models/model1.notation
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/models/model1.notation
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/models/model1.notation

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayerOperatorConfigImplTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayerOperatorConfigImplTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayerOperatorConfigImplTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayerOperatorConfigImplTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/LayerOperatorConfigImplTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/OperatorConfigImplTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/OperatorConfigImplTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/OperatorConfigImplTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/OperatorConfigImplTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/configmodel/layersconfig/impl/OperatorConfigImplTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/ManageExtPropertyTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/ManageExtPropertyTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/ManageExtPropertyTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/ManageExtPropertyTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/ManageExtPropertyTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/PropertyValueFactoryTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/PropertyValueFactoryTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/PropertyValueFactoryTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/PropertyValueFactoryTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/PropertyValueFactoryTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ExpressionMatcherTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ExpressionMatcherTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ExpressionMatcherTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ExpressionMatcherTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ExpressionMatcherTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/exprmatcher/TraceValueChangedEventListener.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/exprmatcher/TraceValueChangedEventListener.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/exprmatcher/TraceValueChangedEventListener.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/exprmatcher/TraceValueChangedEventListener.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/exprmatcher/TraceValueChangedEventListener.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ValueChangedEventNotifierFactoryTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ValueChangedEventNotifierFactoryTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ValueChangedEventNotifierFactoryTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ValueChangedEventNotifierFactoryTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ValueChangedEventNotifierFactoryTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ValueChangedEventNotifierTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ValueChangedEventNotifierTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ValueChangedEventNotifierTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ValueChangedEventNotifierTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/exprmatcher/ValueChangedEventNotifierTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/integration/LayersStateAfterReloadTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/integration/LayersStateAfterReloadTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/integration/LayersStateAfterReloadTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/integration/LayersStateAfterReloadTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/integration/LayersStateAfterReloadTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/AbstractLayerImplWithApplicationTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/AbstractLayerImplWithApplicationTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/AbstractLayerImplWithApplicationTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/AbstractLayerImplWithApplicationTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/AbstractLayerImplWithApplicationTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/AbstractLayerOperatorImplTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/AbstractLayerOperatorImplTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/AbstractLayerOperatorImplTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/AbstractLayerOperatorImplTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/AbstractLayerOperatorImplTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/BooleanTypeImplTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/BooleanTypeImplTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/BooleanTypeImplTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/BooleanTypeImplTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/BooleanTypeImplTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/CustomPropertyOperatorImplTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/CustomPropertyOperatorImplTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/CustomPropertyOperatorImplTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/CustomPropertyOperatorImplTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/CustomPropertyOperatorImplTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/FakeOperator.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/FakeOperator.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/FakeOperator.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/FakeOperator.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/FakeOperator.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/FontInstanceImplTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/FontInstanceImplTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/FontInstanceImplTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/FontInstanceImplTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/FontInstanceImplTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/IntTypeImplTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/IntTypeImplTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/IntTypeImplTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/IntTypeImplTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/IntTypeImplTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerExpressionInitWithApplicationImplTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerExpressionInitWithApplicationImplTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerExpressionInitWithApplicationImplTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerExpressionInitWithApplicationImplTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerExpressionInitWithApplicationImplTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerImplGetComputeCommandTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerImplGetComputeCommandTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerImplGetComputeCommandTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerImplGetComputeCommandTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerImplGetComputeCommandTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerImplTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerImplTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerImplTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerImplTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerImplTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerImplWithApplicationTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerImplWithApplicationTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerImplWithApplicationTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerImplWithApplicationTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerImplWithApplicationTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorDescriptorImplTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorDescriptorImplTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorDescriptorImplTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorDescriptorImplTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorDescriptorImplTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorDescriptorRegistryImplTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorDescriptorRegistryImplTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorDescriptorRegistryImplTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorDescriptorRegistryImplTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayerOperatorDescriptorRegistryImplTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersFactoryForStackImplWithApplicationTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersFactoryForStackImplWithApplicationTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersFactoryForStackImplWithApplicationTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersFactoryForStackImplWithApplicationTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersFactoryForStackImplWithApplicationTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersStackApplicationImplTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersStackApplicationImplTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersStackApplicationImplTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersStackApplicationImplTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/LayersStackApplicationImplTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyRegistryImplTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyRegistryImplTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyRegistryImplTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyRegistryImplTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertyRegistryImplTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertySetterRegistryImplTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertySetterRegistryImplTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertySetterRegistryImplTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertySetterRegistryImplTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/PropertySetterRegistryImplTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/RegExpLayerImplWithQueriesTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/RegExpLayerImplWithQueriesTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/RegExpLayerImplWithQueriesTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/RegExpLayerImplWithQueriesTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/RegExpLayerImplWithQueriesTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorDescriptorImplTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorDescriptorImplTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorDescriptorImplTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorDescriptorImplTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorDescriptorImplTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorImplGetComputePropertyCommandTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorImplGetComputePropertyCommandTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorImplGetComputePropertyCommandTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorImplGetComputePropertyCommandTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorImplGetComputePropertyCommandTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorImplWithAplicationTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorImplWithAplicationTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorImplWithAplicationTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorImplWithAplicationTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/StackedLayerOperatorImplWithAplicationTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringTypeImplTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringTypeImplTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringTypeImplTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringTypeImplTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/StringTypeImplTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/TopLayerOperatorDescriptorImplTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/TopLayerOperatorDescriptorImplTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/TopLayerOperatorDescriptorImplTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/TopLayerOperatorDescriptorImplTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/TopLayerOperatorDescriptorImplTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/TopLayerOperatorImplGetComputeCommandTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/TopLayerOperatorImplGetComputeCommandTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/TopLayerOperatorImplGetComputeCommandTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/TopLayerOperatorImplGetComputeCommandTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/TopLayerOperatorImplGetComputeCommandTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/TypeRegistryImplTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/TypeRegistryImplTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/TypeRegistryImplTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/TypeRegistryImplTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/impl/TypeRegistryImplTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayerOperatorDescriptorRegistryLoaderTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayerOperatorDescriptorRegistryLoaderTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayerOperatorDescriptorRegistryLoaderTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayerOperatorDescriptorRegistryLoaderTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayerOperatorDescriptorRegistryLoaderTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayersConfigModelTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayersConfigModelTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayersConfigModelTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayersConfigModelTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/loaders/LayersConfigModelTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/loaders/RegistriesLoaderTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/loaders/RegistriesLoaderTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/loaders/RegistriesLoaderTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/loaders/RegistriesLoaderTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/loaders/RegistriesLoaderTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/util/LayerFactoryTestUtilsTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/util/LayerFactoryTestUtilsTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/util/LayerFactoryTestUtilsTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/util/LayerFactoryTestUtilsTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/util/LayerFactoryTestUtilsTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/util/LayersFactoryForStackTestUtils.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/util/LayersFactoryForStackTestUtils.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/util/LayersFactoryForStackTestUtils.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/util/LayersFactoryForStackTestUtils.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/util/LayersFactoryForStackTestUtils.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/util/LayersFactoryTestUtils.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/util/LayersFactoryTestUtils.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/util/LayersFactoryTestUtils.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/util/LayersFactoryTestUtils.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/util/LayersFactoryTestUtils.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/util/PropertyIndexedListTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/util/PropertyIndexedListTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/util/PropertyIndexedListTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/util/PropertyIndexedListTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/layers/util/PropertyIndexedListTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewChangedEventNotifierFactoryTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewChangedEventNotifierFactoryTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewChangedEventNotifierFactoryTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewChangedEventNotifierFactoryTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewChangedEventNotifierFactoryTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewChangedEventNotifierTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewChangedEventNotifierTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewChangedEventNotifierTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewChangedEventNotifierTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/DiagramViewChangedEventNotifierTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/LayersTreeEventNotifierFactoryTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/LayersTreeEventNotifierFactoryTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/LayersTreeEventNotifierFactoryTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/LayersTreeEventNotifierFactoryTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/LayersTreeEventNotifierFactoryTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/LayersTreeEventNotifierTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/LayersTreeEventNotifierTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/LayersTreeEventNotifierTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/LayersTreeEventNotifierTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/LayersTreeEventNotifierTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/TraceDiagramViewChangedEventListener.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/TraceDiagramViewChangedEventListener.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/TraceDiagramViewChangedEventListener.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/TraceDiagramViewChangedEventListener.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/TraceDiagramViewChangedEventListener.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/TraceLayersModelEventListener.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/TraceLayersModelEventListener.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/TraceLayersModelEventListener.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/TraceLayersModelEventListener.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/TraceLayersModelEventListener.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/TraceUmlNamedElementChangedEventListener.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/TraceUmlNamedElementChangedEventListener.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/TraceUmlNamedElementChangedEventListener.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/TraceUmlNamedElementChangedEventListener.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/TraceUmlNamedElementChangedEventListener.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifierFactoryTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifierFactoryTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifierFactoryTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifierFactoryTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifierFactoryTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifierTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifierTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifierTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifierTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/notifier/UmlNamedElementChangedEventNotifierTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/operators/BooleanAndOperatorTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/operators/BooleanAndOperatorTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/operators/BooleanAndOperatorTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/operators/BooleanAndOperatorTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/operators/BooleanAndOperatorTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/operators/BooleanOrOperatorTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/operators/BooleanOrOperatorTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/operators/BooleanOrOperatorTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/operators/BooleanOrOperatorTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/operators/BooleanOrOperatorTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/operators/FakePropertyOperator.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/operators/FakePropertyOperator.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/operators/FakePropertyOperator.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/operators/FakePropertyOperator.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/operators/FakePropertyOperator.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/DiagramViewToListSynchronizerTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/DiagramViewToListSynchronizerTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/DiagramViewToListSynchronizerTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/DiagramViewToListSynchronizerTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/DiagramViewToListSynchronizerTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/FakeObservableListListener.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/FakeObservableListListener.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/FakeObservableListListener.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/FakeObservableListListener.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/FakeObservableListListener.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/NotationAndUmlModelsFactory.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/NotationAndUmlModelsFactory.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/NotationAndUmlModelsFactory.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/NotationAndUmlModelsFactory.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/NotationAndUmlModelsFactory.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/NotationAndUmlModelsFactoryTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/NotationAndUmlModelsFactoryTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/NotationAndUmlModelsFactoryTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/NotationAndUmlModelsFactoryTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/NotationAndUmlModelsFactoryTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/ObservableListTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/ObservableListTest.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/ObservableListTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/ObservableListTest.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/ObservableListTest.java

layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/TriggeredEventTraces.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/TriggeredEventTraces.java b/layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/TriggeredEventTraces.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/TriggeredEventTraces.java
rename to layers/plugins/org.eclipse.papyrus.layers.stackmodel/test/org/eclipse/papyrus/layers/stackmodel/util/TriggeredEventTraces.java

layers/plugins/org.eclipse.papyrus.layers.ui/.classpath

diff --git a/layers/org.eclipse.papyrus.layers.ui/.classpath b/layers/plugins/org.eclipse.papyrus.layers.ui/.classpath
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/.classpath
rename to layers/plugins/org.eclipse.papyrus.layers.ui/.classpath

layers/plugins/org.eclipse.papyrus.layers.ui/.options

diff --git a/layers/org.eclipse.papyrus.layers.ui/.options b/layers/plugins/org.eclipse.papyrus.layers.ui/.options
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/.options
rename to layers/plugins/org.eclipse.papyrus.layers.ui/.options

layers/plugins/org.eclipse.papyrus.layers.ui/.project

diff --git a/layers/org.eclipse.papyrus.layers.ui/.project b/layers/plugins/org.eclipse.papyrus.layers.ui/.project
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/.project
rename to layers/plugins/org.eclipse.papyrus.layers.ui/.project

layers/plugins/org.eclipse.papyrus.layers.ui/.settings/org.eclipse.jdt.core.prefs

diff --git a/layers/org.eclipse.papyrus.layers.ui/.settings/org.eclipse.jdt.core.prefs b/layers/plugins/org.eclipse.papyrus.layers.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/.settings/org.eclipse.jdt.core.prefs
rename to layers/plugins/org.eclipse.papyrus.layers.ui/.settings/org.eclipse.jdt.core.prefs

layers/plugins/org.eclipse.papyrus.layers.ui/.settings/org.eclipse.jdt.ui.prefs

diff --git a/layers/org.eclipse.papyrus.layers.ui/.settings/org.eclipse.jdt.ui.prefs b/layers/plugins/org.eclipse.papyrus.layers.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/.settings/org.eclipse.jdt.ui.prefs
rename to layers/plugins/org.eclipse.papyrus.layers.ui/.settings/org.eclipse.jdt.ui.prefs

layers/plugins/org.eclipse.papyrus.layers.ui/META-INF/MANIFEST.MF

diff --git a/layers/org.eclipse.papyrus.layers.ui/META-INF/MANIFEST.MF b/layers/plugins/org.eclipse.papyrus.layers.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/META-INF/MANIFEST.MF
rename to layers/plugins/org.eclipse.papyrus.layers.ui/META-INF/MANIFEST.MF

layers/plugins/org.eclipse.papyrus.layers.ui/about.html

diff --git a/layers/org.eclipse.papyrus.layers.ui/about.html b/layers/plugins/org.eclipse.papyrus.layers.ui/about.html
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/about.html
rename to layers/plugins/org.eclipse.papyrus.layers.ui/about.html

layers/plugins/org.eclipse.papyrus.layers.ui/build.properties

diff --git a/layers/org.eclipse.papyrus.layers.ui/build.properties b/layers/plugins/org.eclipse.papyrus.layers.ui/build.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/build.properties
rename to layers/plugins/org.eclipse.papyrus.layers.ui/build.properties

layers/plugins/org.eclipse.papyrus.layers.ui/icons/LayersStackApplication.gif

diff --git a/layers/org.eclipse.papyrus.layers.ui/icons/LayersStackApplication.gif b/layers/plugins/org.eclipse.papyrus.layers.ui/icons/LayersStackApplication.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/icons/LayersStackApplication.gif
rename to layers/plugins/org.eclipse.papyrus.layers.ui/icons/LayersStackApplication.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.ui/icons/icon_delete.png

diff --git a/layers/org.eclipse.papyrus.layers.ui/icons/icon_delete.png b/layers/plugins/org.eclipse.papyrus.layers.ui/icons/icon_delete.png
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/icons/icon_delete.png
rename to layers/plugins/org.eclipse.papyrus.layers.ui/icons/icon_delete.png
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.ui/icons/layers.gif

diff --git a/layers/org.eclipse.papyrus.layers.ui/icons/layers.gif b/layers/plugins/org.eclipse.papyrus.layers.ui/icons/layers.gif
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/icons/layers.gif
rename to layers/plugins/org.eclipse.papyrus.layers.ui/icons/layers.gif
Binary files differ

layers/plugins/org.eclipse.papyrus.layers.ui/plugin.properties

diff --git a/layers/org.eclipse.papyrus.layers.ui/plugin.properties b/layers/plugins/org.eclipse.papyrus.layers.ui/plugin.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/plugin.properties
rename to layers/plugins/org.eclipse.papyrus.layers.ui/plugin.properties

layers/plugins/org.eclipse.papyrus.layers.ui/plugin.xml

diff --git a/layers/org.eclipse.papyrus.layers.ui/plugin.xml b/layers/plugins/org.eclipse.papyrus.layers.ui/plugin.xml
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/plugin.xml
rename to layers/plugins/org.eclipse.papyrus.layers.ui/plugin.xml

layers/plugins/org.eclipse.papyrus.layers.ui/pom.xml

diff --git a/layers/plugins/org.eclipse.papyrus.layers.ui/pom.xml b/layers/plugins/org.eclipse.papyrus.layers.ui/pom.xml
new file mode 100755
index 0000000..4026ce1
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.layers.ui/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.incubation.layers</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.layers.plugins</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>org.eclipse.papyrus.layers.ui</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	
+</project>
\ No newline at end of file

layers/plugins/org.eclipse.papyrus.layers.ui/properties/properties-orig.ctx

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/properties-orig.ctx b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/properties-orig.ctx
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/properties-orig.ctx
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/properties-orig.ctx

layers/plugins/org.eclipse.papyrus.layers.ui/properties/properties-v1.ctx

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/properties-v1.ctx b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/properties-v1.ctx
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/properties-v1.ctx
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/properties-v1.ctx

layers/plugins/org.eclipse.papyrus.layers.ui/properties/properties-v2.ctx

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/properties-v2.ctx b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/properties-v2.ctx
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/properties-v2.ctx
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/properties-v2.ctx

layers/plugins/org.eclipse.papyrus.layers.ui/properties/properties.ctx

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/properties.ctx b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/properties.ctx
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/properties.ctx
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/properties.ctx

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleAbstractLayer.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleAbstractLayer.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleAbstractLayer.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleAbstractLayer.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleAbstractLayer.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleAbstractLayerOperator.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleAbstractLayerOperator.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleAbstractLayerOperator.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleAbstractLayerOperator.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleAbstractLayerOperator.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleAndStackedLayerOperatorDescriptor.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleAndStackedLayerOperatorDescriptor.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleAndStackedLayerOperatorDescriptor.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleAndStackedLayerOperatorDescriptor.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleAndStackedLayerOperatorDescriptor.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleApplicationDependantElement.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleApplicationDependantElement.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleApplicationDependantElement.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleApplicationDependantElement.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleApplicationDependantElement.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleBooleanInstance.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleBooleanInstance.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleBooleanInstance.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleBooleanInstance.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleBooleanInstance.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleBooleanType.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleBooleanType.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleBooleanType.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleBooleanType.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleBooleanType.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleColor.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleColor.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleColor.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleColor.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleColor.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleColorInstance.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleColorInstance.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleColorInstance.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleColorInstance.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleColorInstance.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleComputePropertyValueCommandItf.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleComputePropertyValueCommandItf.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleComputePropertyValueCommandItf.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleComputePropertyValueCommandItf.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleComputePropertyValueCommandItf.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleCustomLayerOperator.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleCustomLayerOperator.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleCustomLayerOperator.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleCustomLayerOperator.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleCustomLayerOperator.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleCustomPropertyOperator.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleCustomPropertyOperator.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleCustomPropertyOperator.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleCustomPropertyOperator.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleCustomPropertyOperator.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleCustomType.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleCustomType.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleCustomType.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleCustomType.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleCustomType.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleDefaultPropertyOperator.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleDefaultPropertyOperator.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleDefaultPropertyOperator.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleDefaultPropertyOperator.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleDefaultPropertyOperator.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFill.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFill.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFill.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFill.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFill.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFillInstance.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFillInstance.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFillInstance.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFillInstance.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFillInstance.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFillPropertySetter.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFillPropertySetter.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFillPropertySetter.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFillPropertySetter.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFillPropertySetter.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFolder.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFolder.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFolder.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFolder.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFolder.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFolderElement.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFolderElement.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFolderElement.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFolderElement.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFolderElement.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFontInstance.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFontInstance.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFontInstance.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFontInstance.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFontInstance.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFontPropertySetter.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFontPropertySetter.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFontPropertySetter.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFontPropertySetter.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFontPropertySetter.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFontType.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFontType.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFontType.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFontType.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleFontType.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIntInstance.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIntInstance.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIntInstance.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIntInstance.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIntInstance.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIntType.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIntType.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIntType.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIntType.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIntType.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIsAbstractUmlSetter.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIsAbstractUmlSetter.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIsAbstractUmlSetter.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIsAbstractUmlSetter.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIsAbstractUmlSetter.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIsValidPropertySetter.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIsValidPropertySetter.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIsValidPropertySetter.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIsValidPropertySetter.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIsValidPropertySetter.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIsVisiblePropertySetter.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIsVisiblePropertySetter.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIsVisiblePropertySetter.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIsVisiblePropertySetter.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleIsVisiblePropertySetter.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayer.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayer.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayer.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayer.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayer.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerApplicationFactory.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerApplicationFactory.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerApplicationFactory.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerApplicationFactory.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerApplicationFactory.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerDescriptor.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerDescriptor.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerDescriptor.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerDescriptor.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerDescriptor.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerDescriptorRegistry.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerDescriptorRegistry.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerDescriptorRegistry.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerDescriptorRegistry.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerDescriptorRegistry.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerExpression.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerExpression.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerExpression.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerExpression.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerExpression.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerNamedStyle.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerNamedStyle.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerNamedStyle.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerNamedStyle.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerNamedStyle.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerOperator.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerOperator.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerOperator.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerOperator.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerOperator.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerOperatorDescriptor.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerOperatorDescriptor.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerOperatorDescriptor.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerOperatorDescriptor.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerOperatorDescriptor.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerOperatorDescriptorRegistry.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerOperatorDescriptorRegistry.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerOperatorDescriptorRegistry.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerOperatorDescriptorRegistry.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerOperatorDescriptorRegistry.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerStackDescriptorRegistry.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerStackDescriptorRegistry.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerStackDescriptorRegistry.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerStackDescriptorRegistry.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayerStackDescriptorRegistry.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayersStack.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayersStack.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayersStack.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayersStack.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayersStack.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayersStackApplication.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayersStackApplication.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayersStackApplication.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayersStackApplication.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLayersStackApplication.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLineInstance.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLineInstance.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLineInstance.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLineInstance.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLineInstance.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLinePropertySetter.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLinePropertySetter.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLinePropertySetter.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLinePropertySetter.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLinePropertySetter.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLineType.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLineType.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLineType.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLineType.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleLineType.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleMetamodel.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleMetamodel.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleMetamodel.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleMetamodel.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleMetamodel.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleNullInstance.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleNullInstance.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleNullInstance.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleNullInstance.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleNullInstance.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleNullPropertySetter.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleNullPropertySetter.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleNullPropertySetter.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleNullPropertySetter.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleNullPropertySetter.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleOrStackedLayerOperatorDescriptor.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleOrStackedLayerOperatorDescriptor.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleOrStackedLayerOperatorDescriptor.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleOrStackedLayerOperatorDescriptor.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleOrStackedLayerOperatorDescriptor.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleProperty.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleProperty.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleProperty.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleProperty.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleProperty.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertyIndex.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertyIndex.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertyIndex.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertyIndex.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertyIndex.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertyOperator.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertyOperator.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertyOperator.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertyOperator.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertyOperator.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertyRegistry.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertyRegistry.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertyRegistry.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertyRegistry.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertyRegistry.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertySetter.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertySetter.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertySetter.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertySetter.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertySetter.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertySetterRegistry.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertySetterRegistry.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertySetterRegistry.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertySetterRegistry.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultiplePropertySetterRegistry.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleRegExpLayer.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleRegExpLayer.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleRegExpLayer.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleRegExpLayer.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleRegExpLayer.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleRegExpLayerDescriptor.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleRegExpLayerDescriptor.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleRegExpLayerDescriptor.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleRegExpLayerDescriptor.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleRegExpLayerDescriptor.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleSimpleLayerDescriptor.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleSimpleLayerDescriptor.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleSimpleLayerDescriptor.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleSimpleLayerDescriptor.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleSimpleLayerDescriptor.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStackedLayerOperator.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStackedLayerOperator.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStackedLayerOperator.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStackedLayerOperator.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStackedLayerOperator.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStackedLayerOperatorDescriptor.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStackedLayerOperatorDescriptor.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStackedLayerOperatorDescriptor.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStackedLayerOperatorDescriptor.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStackedLayerOperatorDescriptor.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringInstance.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringInstance.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringInstance.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringInstance.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringInstance.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringToPropertyIndexMap.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringToPropertyIndexMap.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringToPropertyIndexMap.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringToPropertyIndexMap.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringToPropertyIndexMap.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringToPropertySetter.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringToPropertySetter.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringToPropertySetter.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringToPropertySetter.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringToPropertySetter.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringToTypeInstanceMap.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringToTypeInstanceMap.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringToTypeInstanceMap.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringToTypeInstanceMap.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringToTypeInstanceMap.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringToTypeMap.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringToTypeMap.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringToTypeMap.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringToTypeMap.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringToTypeMap.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringType.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringType.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringType.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringType.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleStringType.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleTopLayerOperator.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleTopLayerOperator.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleTopLayerOperator.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleTopLayerOperator.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleTopLayerOperator.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleTopLayerOperatorDescriptor.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleTopLayerOperatorDescriptor.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleTopLayerOperatorDescriptor.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleTopLayerOperatorDescriptor.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleTopLayerOperatorDescriptor.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleType.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleType.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleType.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleType.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleType.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleTypeInstance.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleTypeInstance.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleTypeInstance.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleTypeInstance.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleTypeInstance.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleTypeRegistry.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleTypeRegistry.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleTypeRegistry.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/MultipleTypeRegistry.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/MultipleTypeRegistry.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleAbstractLayer.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleAbstractLayer.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleAbstractLayer.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleAbstractLayer.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleAbstractLayer.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleAbstractLayerOperator.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleAbstractLayerOperator.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleAbstractLayerOperator.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleAbstractLayerOperator.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleAbstractLayerOperator.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleAndStackedLayerOperatorDescriptor.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleAndStackedLayerOperatorDescriptor.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleAndStackedLayerOperatorDescriptor.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleAndStackedLayerOperatorDescriptor.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleAndStackedLayerOperatorDescriptor.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleApplicationDependantElement.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleApplicationDependantElement.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleApplicationDependantElement.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleApplicationDependantElement.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleApplicationDependantElement.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleBooleanInstance.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleBooleanInstance.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleBooleanInstance.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleBooleanInstance.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleBooleanInstance.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleBooleanType.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleBooleanType.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleBooleanType.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleBooleanType.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleBooleanType.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleColor.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleColor.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleColor.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleColor.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleColor.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleColorInstance.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleColorInstance.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleColorInstance.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleColorInstance.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleColorInstance.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleComputePropertyValueCommandItf.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleComputePropertyValueCommandItf.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleComputePropertyValueCommandItf.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleComputePropertyValueCommandItf.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleComputePropertyValueCommandItf.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleCustomLayerOperator.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleCustomLayerOperator.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleCustomLayerOperator.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleCustomLayerOperator.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleCustomLayerOperator.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleCustomPropertyOperator.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleCustomPropertyOperator.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleCustomPropertyOperator.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleCustomPropertyOperator.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleCustomPropertyOperator.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleCustomType.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleCustomType.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleCustomType.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleCustomType.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleCustomType.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleDefaultPropertyOperator.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleDefaultPropertyOperator.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleDefaultPropertyOperator.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleDefaultPropertyOperator.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleDefaultPropertyOperator.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFill.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleFill.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFill.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleFill.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFill.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFillInstance.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleFillInstance.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFillInstance.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleFillInstance.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFillInstance.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFillPropertySetter.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleFillPropertySetter.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFillPropertySetter.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleFillPropertySetter.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFillPropertySetter.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFolder.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleFolder.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFolder.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleFolder.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFolder.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFolderElement.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleFolderElement.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFolderElement.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleFolderElement.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFolderElement.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFontInstance.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleFontInstance.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFontInstance.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleFontInstance.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFontInstance.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFontPropertySetter.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleFontPropertySetter.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFontPropertySetter.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleFontPropertySetter.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFontPropertySetter.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFontType.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleFontType.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFontType.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleFontType.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleFontType.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleIntInstance.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleIntInstance.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleIntInstance.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleIntInstance.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleIntInstance.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleIntType.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleIntType.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleIntType.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleIntType.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleIntType.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleIsAbstractUmlSetter.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleIsAbstractUmlSetter.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleIsAbstractUmlSetter.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleIsAbstractUmlSetter.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleIsAbstractUmlSetter.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleIsValidPropertySetter.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleIsValidPropertySetter.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleIsValidPropertySetter.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleIsValidPropertySetter.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleIsValidPropertySetter.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleIsVisiblePropertySetter.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleIsVisiblePropertySetter.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleIsVisiblePropertySetter.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleIsVisiblePropertySetter.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleIsVisiblePropertySetter.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayer.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayer.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayer.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayer.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayer.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerApplicationFactory.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerApplicationFactory.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerApplicationFactory.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerApplicationFactory.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerApplicationFactory.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerDescriptor.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerDescriptor.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerDescriptor.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerDescriptor.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerDescriptor.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerDescriptorRegistry.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerDescriptorRegistry.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerDescriptorRegistry.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerDescriptorRegistry.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerDescriptorRegistry.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerExpression.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerExpression.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerExpression.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerExpression.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerExpression.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerNamedStyle.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerNamedStyle.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerNamedStyle.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerNamedStyle.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerNamedStyle.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerOperator.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerOperator.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerOperator.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerOperator.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerOperator.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerOperatorDescriptor.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerOperatorDescriptor.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerOperatorDescriptor.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerOperatorDescriptor.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerOperatorDescriptor.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerOperatorDescriptorRegistry.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerOperatorDescriptorRegistry.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerOperatorDescriptorRegistry.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerOperatorDescriptorRegistry.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerOperatorDescriptorRegistry.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerStackDescriptorRegistry.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerStackDescriptorRegistry.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerStackDescriptorRegistry.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerStackDescriptorRegistry.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayerStackDescriptorRegistry.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayersStack.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayersStack.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayersStack.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayersStack.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayersStack.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayersStackApplication.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayersStackApplication.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayersStackApplication.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayersStackApplication.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLayersStackApplication.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLineInstance.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLineInstance.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLineInstance.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLineInstance.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLineInstance.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLinePropertySetter.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLinePropertySetter.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLinePropertySetter.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLinePropertySetter.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLinePropertySetter.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLineType.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLineType.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLineType.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleLineType.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleLineType.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleMetamodel.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleMetamodel.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleMetamodel.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleMetamodel.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleMetamodel.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleNullInstance.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleNullInstance.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleNullInstance.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleNullInstance.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleNullInstance.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleNullPropertySetter.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleNullPropertySetter.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleNullPropertySetter.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleNullPropertySetter.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleNullPropertySetter.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleOrStackedLayerOperatorDescriptor.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleOrStackedLayerOperatorDescriptor.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleOrStackedLayerOperatorDescriptor.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleOrStackedLayerOperatorDescriptor.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleOrStackedLayerOperatorDescriptor.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleProperty.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleProperty.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleProperty.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleProperty.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleProperty.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertyIndex.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertyIndex.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertyIndex.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertyIndex.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertyIndex.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertyOperator.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertyOperator.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertyOperator.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertyOperator.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertyOperator.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertyRegistry.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertyRegistry.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertyRegistry.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertyRegistry.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertyRegistry.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertySetter.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertySetter.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertySetter.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertySetter.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertySetter.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertySetterRegistry.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertySetterRegistry.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertySetterRegistry.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertySetterRegistry.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SinglePropertySetterRegistry.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleRegExpLayer.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleRegExpLayer.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleRegExpLayer.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleRegExpLayer.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleRegExpLayer.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleRegExpLayerDescriptor.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleRegExpLayerDescriptor.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleRegExpLayerDescriptor.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleRegExpLayerDescriptor.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleRegExpLayerDescriptor.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleSimpleLayerDescriptor.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleSimpleLayerDescriptor.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleSimpleLayerDescriptor.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleSimpleLayerDescriptor.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleSimpleLayerDescriptor.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStackedLayerOperator.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleStackedLayerOperator.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStackedLayerOperator.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleStackedLayerOperator.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStackedLayerOperator.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStackedLayerOperatorDescriptor.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleStackedLayerOperatorDescriptor.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStackedLayerOperatorDescriptor.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleStackedLayerOperatorDescriptor.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStackedLayerOperatorDescriptor.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringInstance.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringInstance.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringInstance.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringInstance.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringInstance.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringToPropertyIndexMap.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringToPropertyIndexMap.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringToPropertyIndexMap.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringToPropertyIndexMap.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringToPropertyIndexMap.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringToPropertySetter.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringToPropertySetter.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringToPropertySetter.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringToPropertySetter.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringToPropertySetter.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringToTypeInstanceMap.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringToTypeInstanceMap.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringToTypeInstanceMap.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringToTypeInstanceMap.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringToTypeInstanceMap.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringToTypeMap.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringToTypeMap.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringToTypeMap.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringToTypeMap.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringToTypeMap.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringType.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringType.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringType.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringType.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleStringType.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleTopLayerOperator.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleTopLayerOperator.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleTopLayerOperator.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleTopLayerOperator.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleTopLayerOperator.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleTopLayerOperatorDescriptor.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleTopLayerOperatorDescriptor.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleTopLayerOperatorDescriptor.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleTopLayerOperatorDescriptor.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleTopLayerOperatorDescriptor.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleType.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleType.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleType.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleType.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleType.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleTypeInstance.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleTypeInstance.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleTypeInstance.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleTypeInstance.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleTypeInstance.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleTypeRegistry.xwt

diff --git a/layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleTypeRegistry.xwt b/layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleTypeRegistry.xwt
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/properties/ui/SingleTypeRegistry.xwt
rename to layers/plugins/org.eclipse.papyrus.layers.ui/properties/ui/SingleTypeRegistry.xwt

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers/ui/Activator.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers/ui/Activator.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers/ui/Activator.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers/ui/Activator.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers/ui/Activator.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AbstractCreateLayerExpressionHandler.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AbstractCreateLayerExpressionHandler.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AbstractCreateLayerExpressionHandler.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AbstractCreateLayerExpressionHandler.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AbstractCreateLayerExpressionHandler.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AbstractLayerStackCommand.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AbstractLayerStackCommand.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AbstractLayerStackCommand.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AbstractLayerStackCommand.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AbstractLayerStackCommand.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AbstractLayersCommand.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AbstractLayersCommand.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AbstractLayersCommand.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AbstractLayersCommand.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AbstractLayersCommand.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AttachDiagramViewsToLayer.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AttachDiagramViewsToLayer.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AttachDiagramViewsToLayer.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AttachDiagramViewsToLayer.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AttachDiagramViewsToLayer.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AttachLayerStackCommand.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AttachLayerStackCommand.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AttachLayerStackCommand.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AttachLayerStackCommand.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AttachLayerStackCommand.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AttachPropertyFromListToLayer.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AttachPropertyFromListToLayer.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AttachPropertyFromListToLayer.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AttachPropertyFromListToLayer.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AttachPropertyFromListToLayer.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AttachPropertyToLayer.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AttachPropertyToLayer.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AttachPropertyToLayer.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AttachPropertyToLayer.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/AttachPropertyToLayer.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateLayerHandler.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateLayerHandler.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateLayerHandler.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateLayerHandler.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateLayerHandler.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateLayerOperatorsFromParameter.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateLayerOperatorsFromParameter.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateLayerOperatorsFromParameter.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateLayerOperatorsFromParameter.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateLayerOperatorsFromParameter.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateRegExpLayerHandler.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateRegExpLayerHandler.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateRegExpLayerHandler.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateRegExpLayerHandler.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateRegExpLayerHandler.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateStackedLayerOperatorHandler.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateStackedLayerOperatorHandler.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateStackedLayerOperatorHandler.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateStackedLayerOperatorHandler.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateStackedLayerOperatorHandler.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateTopLayerOperatorHandler.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateTopLayerOperatorHandler.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateTopLayerOperatorHandler.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateTopLayerOperatorHandler.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/CreateTopLayerOperatorHandler.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/DeleteItemHandler.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/DeleteItemHandler.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/DeleteItemHandler.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/DeleteItemHandler.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/DeleteItemHandler.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/DetachLayerStackCommand.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/DetachLayerStackCommand.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/DetachLayerStackCommand.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/DetachLayerStackCommand.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/DetachLayerStackCommand.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/LayerOperatorsParameterValues.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/LayerOperatorsParameterValues.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/LayerOperatorsParameterValues.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/LayerOperatorsParameterValues.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/LayerOperatorsParameterValues.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/package-info.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/package-info.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/package-info.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/package-info.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/commands/package-info.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/explorer/LayerExplorerPageBookView.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/explorer/LayerExplorerPageBookView.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/explorer/LayerExplorerPageBookView.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/explorer/LayerExplorerPageBookView.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/explorer/LayerExplorerPageBookView.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/explorer/LayersExplorerPage.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/explorer/LayersExplorerPage.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/explorer/LayersExplorerPage.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/explorer/LayersExplorerPage.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/explorer/LayersExplorerPage.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/explorer/LayersExplorerView.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/explorer/LayersExplorerView.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/explorer/LayersExplorerView.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/explorer/LayersExplorerView.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/explorer/LayersExplorerView.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/handlers/AttachDiagramSelectedItemsToCurrentLayer.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/handlers/AttachDiagramSelectedItemsToCurrentLayer.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/handlers/AttachDiagramSelectedItemsToCurrentLayer.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/handlers/AttachDiagramSelectedItemsToCurrentLayer.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/handlers/AttachDiagramSelectedItemsToCurrentLayer.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/handlers/CreateAllViewsDerivedLayerHandler.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/handlers/CreateAllViewsDerivedLayerHandler.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/handlers/CreateAllViewsDerivedLayerHandler.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/handlers/CreateAllViewsDerivedLayerHandler.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/handlers/CreateAllViewsDerivedLayerHandler.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/handlers/OpenLayerExplorerHandler.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/handlers/OpenLayerExplorerHandler.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/handlers/OpenLayerExplorerHandler.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/handlers/OpenLayerExplorerHandler.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/handlers/OpenLayerExplorerHandler.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/handlers/RemoveDiagramSelectedItemsFromCurrentLayer.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/handlers/RemoveDiagramSelectedItemsFromCurrentLayer.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/handlers/RemoveDiagramSelectedItemsFromCurrentLayer.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/handlers/RemoveDiagramSelectedItemsFromCurrentLayer.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/handlers/RemoveDiagramSelectedItemsFromCurrentLayer.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/utils/HandlersUtils.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/utils/HandlersUtils.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/utils/HandlersUtils.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/utils/HandlersUtils.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/utils/HandlersUtils.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/view/LayersExplorerView.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/view/LayersExplorerView.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/view/LayersExplorerView.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/view/LayersExplorerView.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/view/LayersExplorerView.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/view/LayersExplorerViewUtils.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/view/LayersExplorerViewUtils.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/view/LayersExplorerViewUtils.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/view/LayersExplorerViewUtils.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/view/LayersExplorerViewUtils.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/view/LayersTreeViewerFactory.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/view/LayersTreeViewerFactory.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/view/LayersTreeViewerFactory.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/view/LayersTreeViewerFactory.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/view/LayersTreeViewerFactory.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/view/package-info.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/view/package-info.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/view/package-info.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/view/package-info.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/papyrus/layers3/ui/view/package-info.java

layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/wb/swt/SWTResourceManager.java

diff --git a/layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/wb/swt/SWTResourceManager.java b/layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/wb/swt/SWTResourceManager.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.ui/src/org/eclipse/wb/swt/SWTResourceManager.java
rename to layers/plugins/org.eclipse.papyrus.layers.ui/src/org/eclipse/wb/swt/SWTResourceManager.java

layers/plugins/org.eclipse.papyrus.layers.updatesite/.project

diff --git a/layers/org.eclipse.papyrus.layers.updatesite/.project b/layers/plugins/org.eclipse.papyrus.layers.updatesite/.project
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.updatesite/.project
rename to layers/plugins/org.eclipse.papyrus.layers.updatesite/.project

layers/plugins/org.eclipse.papyrus.layers.updatesite/site.xml

diff --git a/layers/org.eclipse.papyrus.layers.updatesite/site.xml b/layers/plugins/org.eclipse.papyrus.layers.updatesite/site.xml
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.updatesite/site.xml
rename to layers/plugins/org.eclipse.papyrus.layers.updatesite/site.xml

layers/plugins/pom.xml

diff --git a/layers/plugins/pom.xml b/layers/plugins/pom.xml
new file mode 100755
index 0000000..72a4a0c
--- /dev/null
+++ b/layers/plugins/pom.xml
@@ -0,0 +1,30 @@
+<?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.incubation.layers</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.layers.parent</artifactId>	
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.layers.plugins</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.layers.notationmodel.edit</module>
+		<module>org.eclipse.papyrus.layers.runtime</module>
+		<module>org.eclipse.papyrus.layers.stackmodel</module>
+		<module>org.eclipse.papyrus.layers.stackmodel.diagram</module>
+		<module>org.eclipse.papyrus.layers.stackmodel.edit</module>
+		<module>org.eclipse.papyrus.layers.stackmodel.editor</module>
+		<module>org.eclipse.papyrus.layers.ui</module>
+		
+		<!-- FIXME present in Papyrus core repo but not in the build 
+		org.eclipse.papyrus.layers.dev.ui
+		org.eclipse.papyrus.layers.updatesite
+		-->
+	</modules>	
+	
+</project>
\ No newline at end of file

layers/pom.xml

diff --git a/layers/pom.xml b/layers/pom.xml
index 6aaf06f..844a30c 100755
--- a/layers/pom.xml
+++ b/layers/pom.xml
@@ -1,32 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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</groupId>
-		<artifactId>org.eclipse.papyrus.incubation</artifactId>		
-		<version>3.0.0-SNAPSHOT</version>
+		<groupId>org.eclipse.papyrus.incubation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.all</artifactId>		
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.papyrus.layers.parent</artifactId>
+
+	<groupId>org.eclipse.papyrus.incubation.layers</groupId>
+	<artifactId>org.eclipse.papyrus.incubation.layers.parent</artifactId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<modules>
-		<module>org.eclipse.papyrus.layers.notationmodel.edit</module>
-		<module>org.eclipse.papyrus.layers.runtime</module>
-		<module>org.eclipse.papyrus.layers.stackmodel</module>
-		<module>org.eclipse.papyrus.layers.stackmodel.diagram</module>
-		<module>org.eclipse.papyrus.layers.stackmodel.edit</module>
-		<module>org.eclipse.papyrus.layers.stackmodel.editor</module>
-		<module>org.eclipse.papyrus.layers.ui</module>
-		<module>org.eclipse.papyrus.layers.feature</module>
-		
-		<!-- FIXME present in Papyrus core repo but not in the build 
-		org.eclipse.papyrus.layers.dev.ui
-		org.eclipse.papyrus.layers.integrationtests
-		org.eclipse.papyrus.layers.stackmodel.tests
-		org.eclipse.papyrus.layers.updatesite
-		-->
-		
+		<module>features</module>
+		<module>plugins</module>
+		<module>tests</module>		
 	</modules>	
-	
+		
+	<profiles>
+		<profile>
+	      <id>layers</id>	
+	     
+		  <properties>
+			<targetplatform.groupId>org.eclipse.papyrus.incubation.layers</targetplatform.groupId>
+			<targetplatform.artifactId>org.eclipse.papyrus.incubation.layers.targetplatform</targetplatform.artifactId>
+			<targetplatform.version>1.2.0-SNAPSHOT</targetplatform.version>
+		  </properties>
+	            
+	      <modules>
+	      	<module>releng</module>
+	      </modules>
+	    </profile>
+	</profiles>
+		
 </project>
\ No newline at end of file

layers/releng/org.eclipse.papyrus.incubation.layers.p2/.project

diff --git a/layers/releng/org.eclipse.papyrus.incubation.layers.p2/.project b/layers/releng/org.eclipse.papyrus.incubation.layers.p2/.project
new file mode 100755
index 0000000..0a79233
--- /dev/null
+++ b/layers/releng/org.eclipse.papyrus.incubation.layers.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>

layers/releng/org.eclipse.papyrus.incubation.layers.p2/category.xml

diff --git a/layers/releng/org.eclipse.papyrus.incubation.layers.p2/category.xml b/layers/releng/org.eclipse.papyrus.incubation.layers.p2/category.xml
new file mode 100755
index 0000000..04687f7
--- /dev/null
+++ b/layers/releng/org.eclipse.papyrus.incubation.layers.p2/category.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+  <feature url="features/org.eclipse.papyrus.layers.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.layers.feature" version="1.2.0.qualifier">
+      <category name="org.eclipse.papyrus.incubation.category"/>
+   </feature>
+   <feature url="features/org.eclipse.papyrus.layers.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.layers.feature.source" version="1.2.0.qualifier">
+      <category name="org.eclipse.papyrus.incubation.category"/>
+   </feature>
+  
+  <category-def name="org.eclipse.papyrus.incubation.category" label="Papyrus Incubation">
+      <description>
+         Papyrus Incubation features
+      </description>
+   </category-def>
+</site>

layers/releng/org.eclipse.papyrus.incubation.layers.p2/pom.xml

diff --git a/layers/releng/org.eclipse.papyrus.incubation.layers.p2/pom.xml b/layers/releng/org.eclipse.papyrus.incubation.layers.p2/pom.xml
new file mode 100755
index 0000000..9e35bbc
--- /dev/null
+++ b/layers/releng/org.eclipse.papyrus.incubation.layers.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.incubation.layers</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.layers.releng</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.layers.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

layers/releng/pom.xml

diff --git a/layers/releng/pom.xml b/layers/releng/pom.xml
new file mode 100755
index 0000000..7cc8a44
--- /dev/null
+++ b/layers/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.incubation.layers</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.layers.parent</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.layers.releng</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>targetplatform</module>
+		<module>org.eclipse.papyrus.incubation.layers.p2</module>
+	</modules>	
+	
+</project>
\ No newline at end of file

layers/releng/promote/dsmlvalidation.sh

diff --git a/layers/releng/promote/dsmlvalidation.sh b/layers/releng/promote/dsmlvalidation.sh
new file mode 100755
index 0000000..b9dc063
--- /dev/null
+++ b/layers/releng/promote/dsmlvalidation.sh
@@ -0,0 +1,258 @@
+#Based upon Gef4 publish.sh script
+
+#causes the shell to exit if any subcommand or pipeline returns a non-zero status.
+#set -e
+
+# Script may take 5-6 command line parameters:
+# $1: Hudson job name: <name>
+# $2: Hudson build id: <id>
+# $3: Build type: i(ntegration), s(table), r(elease)
+# $4: The release label used to label the drop files, e.g. 3.10.0 or 3.10.1
+# $5: The eclipse target version, e.g. mars or neon
+# $6: Override if exists
+# $7: An optional release label suffix to be appended to drop files name, e.g. M1, RC1 
+
+##Additional variables to specify for each project
+
+#The root url that enables to find the job with ${hudsonJobRootUrl}/$jobName/$buildNumber
+hudsonJobRootUrl="https://hudson.eclipse.org/papyrus/job"
+
+#The name of the tool
+repo="incubation"
+subRepo="layers"
+updates="updates"
+drops="downloads/drops"
+
+#The specific localization
+remoteRoot="/home/data/httpd/download.eclipse.org"
+papyrusRoot="modeling/mdt/papyrus"
+remoteUpdateSiteRoot=${remoteRoot}/${papyrusRoot}/${repo}
+remoteUpdateSite=${remoteUpdateSiteRoot}/${subRepo}
+remoteUpdateSiteDir=${remoteUpdateSite}/${updates}
+echo "remoteUpdateSiteDir: $remoteUpdateSiteDir"
+
+#The localization of the local build target
+targetResults="archive/${subRepo}/releng/org.eclipse.papyrus.${repo}.${subRepo}.p2/target/repository"
+echo "targetResults: $targetResults"
+
+#The rcpPrompote.sh script may be used to publish the Incubation build results. 
+#if [ $# -eq 6 -o $# -eq 7  ];
+#then
+#	jobName=$1
+jobName="Papyrus-Incubation-DsmlValidation"
+	echo "jobName: $jobName"
+#	buildNumber=$2
+buildNumber="4"
+	echo "buildNumber: $buildNumber"
+#	releaseType=$3
+releaseType="i"
+	echo "releaseType: $releaseType"
+#	releaseLabel=$4	
+releaseLabel="1.2.0"
+	echo "releaseLabel: $releaseLabel"
+#	eclipseTarget=$5
+eclipseTarget="oxygen"	
+	echo "eclipseTarget: $eclipseTarget"
+#	override=$6	
+override="y"
+	echo "override: $override"
+
+	if [ -n "$7" ];
+	then
+		releaseLabelSuffix=$7
+		echo "releaseLabelSuffix: $releaseLabelSuffix"
+	fi
+#else
+#	echo "Missing so parameters: command jobName buildNumber releaseType releaseLabel eclipseTarget override [releaseLabelSuffix]"
+#	exit 1;
+#fi
+
+###########jobName parameter###########
+if [ -z "$jobName" ];
+then
+	echo "The Hudson job you want to promote must be specified"
+	exit 1
+fi
+
+###########buildNumber parameter###########
+if [ -z "$buildNumber" ];
+then
+	echo "The id of the $jobName build you want to promote must be specified"
+	exit 1
+fi
+
+###########releaseType parameter###########
+if [ -z "$releaseType" ];
+then
+    echo "The type of build you want to publish to [i(integration), s(table), r(elease)]."
+    exit;
+fi
+echo "Publishing as $releaseType build"
+
+###########releaseLabel parameter###########
+if [ -z "$releaseLabel" ];
+then
+    echo "The release label (e.g. 3.10.0, 3.10.1M2) must be specified."
+    exit 1
+fi
+echo "Release label: $releaseLabel"
+
+###########eclipseTarget parameter###########
+if [ -z "$eclipseTarget" ];
+then
+    echo "The Eclipse target (e.g. mars, neon) must be specified."
+    exit 1
+fi
+echo "Eclipse target : $eclipseTarget"
+
+###########Override parameter###########
+if [ "$override" != y -a "$override" != n ];
+then
+	echo "Parameter override has to 'y'(es) or 'n'(o) but was: $override"
+    exit 0
+fi
+
+if [ "$override" == "y" ];
+then
+	echo "Will override the previous artifacts if found"
+else
+	echo "Will not override the previous arifacts if found"
+fi
+
+########### Compute local build results using buildNumber ###########
+if [ "$buildNumber" = "lastStable" -o "$buildNumber" = "lastSuccessful" ];
+then
+	# Reverse lookup the build id (in case lastSuccessful or lastStable was used)
+	for i in $(find ~/.hudson/jobs/$jobName/builds/ -type l)
+	do
+		if [ "$(readlink -f $i)" = "$(readlink -f ~/.hudson/jobs/$jobName/$buildNumber)" ];
+		then
+			buildNumber=${i##*/}
+		fi
+	done
+	echo "Reverse lookup (lastStable/lastSuccessful) yielded buildNumber: $buildNumber"
+fi
+
+echo "~/.hudson/jobs/${jobName}/builds/${buildNumber}"
+jobDir=$(readlink -f ~/.hudson/jobs/${jobName}/builds/${buildNumber})
+if ! [ -d $jobDir ];
+then
+	echo "The specified buildNumber does not refer to an existing build: $buildNumber"
+	exit 1
+fi
+
+localResults=${jobDir}/${targetResults}
+echo "localResults: ${localResults}"
+
+########### Promote Job ###########
+destination=$remoteUpdateSiteDir/$eclipseTarget/${releaseLabel}${releaseLabelSuffix}
+echo "Destination: $destination"
+
+if [ "$override" == "n" ];
+then
+	if [ -d $destination ];
+	then
+		if [ "$(ls -A ${destination})" ];
+		then
+			echo "The destination is not empty. You may consider overriding or archiving"
+			exit 1
+		fi
+	fi
+fi
+
+if [ "$override" == "y" ];
+then
+	if [ -d $destination ];
+	then
+		echo "Overriding the RCP by cleaning the $destination folder"
+		rm -rf ${destination}/*
+	fi
+fi
+
+#Go to the artifact directory
+cd $localResults
+echo "Promoting the Job to $destination"
+#No error if exists, makes parent directories as needed
+mkdir -p $destination
+
+#Copy the contents onto the temp folder and change the permissions
+cp -R * $destination
+
+
+########### Update composites ###########
+# TODO update composite root ./eclipseTarget/* and parent ./*
+echo "Update Composites"
+timestamp=$(date +%s000)
+
+# This function indents the text with two white spaces
+indent() {
+sed 's/^/  /';
+}
+
+# This function is used to generate the composites
+function updateComposites() {
+cat > "compositeArtifacts.xml" <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<repository name="Papyrus" type="org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository" version="1.0.0">
+  <properties size="1">
+    <property name="p2.timestamp" value="$1"/>
+  </properties>
+  <children size="$2">
+$(	
+for file in *; do 
+if [ -d $file ]; then 
+    printf "<child location='${file}'/>" | indent | indent
+fi
+done
+)
+  </children>
+</repository>
+EOF
+
+cat > "compositeContent.xml" <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<repository name="Papyrus" type="org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" version="1.0.0">
+  <properties size="1">
+    <property name="p2.timestamp" value="$1"/>
+  </properties>
+  <children size="$2">
+$(	
+for file in *; do 
+if [ -d $file ]; then 
+    printf "<child location='${file}'/>" | indent | indent
+fi
+done
+)
+  </children>
+</repository>
+EOF
+}
+
+echo "Update root composites: $remoteUpdateSite"
+cd $remoteUpdateSite
+childrenCount=$(find . -maxdepth 1 -type d  \( ! -iname ".*" \) | wc -l)
+updateComposites $timestamp $childrenCount
+
+echo "Update eclipseTarget composites: $remoteUpdateSiteDir"
+cd $remoteUpdateSiteDir
+childrenCount=$(find . -maxdepth 1 -type d  \( ! -iname ".*" \) | wc -l)
+updateComposites $timestamp $childrenCount
+
+echo "Update releaseLabel composites: $remoteUpdateSiteDir/$eclipseTarget"
+cd $remoteUpdateSiteDir/$eclipseTarget
+childrenCount=$(find . -maxdepth 1 -type d  \( ! -iname ".*" \) | wc -l)
+updateComposites $timestamp $childrenCount
+
+
+########### Set Access Rights ###########
+
+# This function sets the acess rights to allow all memebers of the group to edit the files
+function setAccessRights() {
+	chmod -R 775 "$1"
+	chgrp -hR modeling.mdt.papyrus "$1"
+}
+echo "Set access right -R: $remoteUpdateSiteDir"
+setAccessRights $remoteUpdateSiteDir
+
+
+echo "publishing done."
\ No newline at end of file

layers/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.layers.targetplatform.target

diff --git a/layers/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.layers.targetplatform.target b/layers/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.layers.targetplatform.target
new file mode 100755
index 0000000..077b269
--- /dev/null
+++ b/layers/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.layers.targetplatform.target
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Layers - Oxygen" sequenceNumber="1504189034">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository location="file:/home/data/httpd/download.eclipse.org/releases/oxygen/"/>
+    </location>
+  </locations>
+</target>

layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/.project

diff --git a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/.project b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/.project
new file mode 100755
index 0000000..7477ea0
--- /dev/null
+++ b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.incubation.targetplatform.oxygen</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.target

diff --git a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.target b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.target
new file mode 100755
index 0000000..dbd7e60
--- /dev/null
+++ b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.target
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Layers - Oxygen" sequenceNumber="1504189034">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <repository location="http://download.eclipse.org/releases/oxygen/"/>
+    </location>
+  </locations>
+</target>

layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.tpd

diff --git a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.tpd b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.tpd
new file mode 100755
index 0000000..1d1ea71
--- /dev/null
+++ b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.tpd
@@ -0,0 +1,6 @@
+target "Layers - Oxygen" with source requirements
+
+location "http://download.eclipse.org/releases/oxygen/" {
+
+}
+

layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/pom.xml

diff --git a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/pom.xml b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/pom.xml
new file mode 100755
index 0000000..ed515f8
--- /dev/null
+++ b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.elk.targetplatform/pom.xml
@@ -0,0 +1,14 @@
+<?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.incubation.layers</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.layers.releng.targetplatform</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>	
+	
+	<artifactId>org.eclipse.papyrus.incubation.layers.targetplatform</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	
+</project>
\ No newline at end of file

layers/releng/targetplatform/pom.xml

diff --git a/layers/releng/targetplatform/pom.xml b/layers/releng/targetplatform/pom.xml
new file mode 100755
index 0000000..eecb890
--- /dev/null
+++ b/layers/releng/targetplatform/pom.xml
@@ -0,0 +1,18 @@
+<?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.incubation.layers</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.layers.releng</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.layers.releng.targetplatform</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.incubation.layers.targetplatform</module>
+	</modules>
+	
+</project>
\ No newline at end of file

layers/tests/org.eclipse.papyrus.layers.integrationtests/.classpath

diff --git a/layers/org.eclipse.papyrus.layers.integrationtests/.classpath b/layers/tests/org.eclipse.papyrus.layers.integrationtests/.classpath
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.integrationtests/.classpath
rename to layers/tests/org.eclipse.papyrus.layers.integrationtests/.classpath

layers/tests/org.eclipse.papyrus.layers.integrationtests/.project

diff --git a/layers/org.eclipse.papyrus.layers.integrationtests/.project b/layers/tests/org.eclipse.papyrus.layers.integrationtests/.project
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.integrationtests/.project
rename to layers/tests/org.eclipse.papyrus.layers.integrationtests/.project

layers/tests/org.eclipse.papyrus.layers.integrationtests/.settings/org.eclipse.jdt.core.prefs

diff --git a/layers/org.eclipse.papyrus.layers.integrationtests/.settings/org.eclipse.jdt.core.prefs b/layers/tests/org.eclipse.papyrus.layers.integrationtests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.integrationtests/.settings/org.eclipse.jdt.core.prefs
rename to layers/tests/org.eclipse.papyrus.layers.integrationtests/.settings/org.eclipse.jdt.core.prefs

layers/tests/org.eclipse.papyrus.layers.integrationtests/.settings/org.eclipse.jdt.ui.prefs

diff --git a/layers/org.eclipse.papyrus.layers.integrationtests/.settings/org.eclipse.jdt.ui.prefs b/layers/tests/org.eclipse.papyrus.layers.integrationtests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.integrationtests/.settings/org.eclipse.jdt.ui.prefs
rename to layers/tests/org.eclipse.papyrus.layers.integrationtests/.settings/org.eclipse.jdt.ui.prefs

layers/tests/org.eclipse.papyrus.layers.integrationtests/META-INF/MANIFEST.MF

diff --git a/layers/org.eclipse.papyrus.layers.integrationtests/META-INF/MANIFEST.MF b/layers/tests/org.eclipse.papyrus.layers.integrationtests/META-INF/MANIFEST.MF
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.integrationtests/META-INF/MANIFEST.MF
rename to layers/tests/org.eclipse.papyrus.layers.integrationtests/META-INF/MANIFEST.MF

layers/tests/org.eclipse.papyrus.layers.integrationtests/about.html

diff --git a/layers/org.eclipse.papyrus.layers.integrationtests/about.html b/layers/tests/org.eclipse.papyrus.layers.integrationtests/about.html
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.integrationtests/about.html
rename to layers/tests/org.eclipse.papyrus.layers.integrationtests/about.html

layers/tests/org.eclipse.papyrus.layers.integrationtests/build.properties

diff --git a/layers/org.eclipse.papyrus.layers.integrationtests/build.properties b/layers/tests/org.eclipse.papyrus.layers.integrationtests/build.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.integrationtests/build.properties
rename to layers/tests/org.eclipse.papyrus.layers.integrationtests/build.properties

layers/tests/org.eclipse.papyrus.layers.integrationtests/models/modeltestReload.di

diff --git a/layers/org.eclipse.papyrus.layers.integrationtests/models/modeltestReload.di b/layers/tests/org.eclipse.papyrus.layers.integrationtests/models/modeltestReload.di
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.integrationtests/models/modeltestReload.di
rename to layers/tests/org.eclipse.papyrus.layers.integrationtests/models/modeltestReload.di

layers/tests/org.eclipse.papyrus.layers.integrationtests/models/modeltestReload.notation

diff --git a/layers/org.eclipse.papyrus.layers.integrationtests/models/modeltestReload.notation b/layers/tests/org.eclipse.papyrus.layers.integrationtests/models/modeltestReload.notation
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.integrationtests/models/modeltestReload.notation
rename to layers/tests/org.eclipse.papyrus.layers.integrationtests/models/modeltestReload.notation

layers/tests/org.eclipse.papyrus.layers.integrationtests/models/modeltestReload.uml

diff --git a/layers/org.eclipse.papyrus.layers.integrationtests/models/modeltestReload.uml b/layers/tests/org.eclipse.papyrus.layers.integrationtests/models/modeltestReload.uml
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.integrationtests/models/modeltestReload.uml
rename to layers/tests/org.eclipse.papyrus.layers.integrationtests/models/modeltestReload.uml

layers/tests/org.eclipse.papyrus.layers.integrationtests/plugin.properties

diff --git a/layers/org.eclipse.papyrus.layers.integrationtests/plugin.properties b/layers/tests/org.eclipse.papyrus.layers.integrationtests/plugin.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.integrationtests/plugin.properties
rename to layers/tests/org.eclipse.papyrus.layers.integrationtests/plugin.properties

layers/tests/org.eclipse.papyrus.layers.integrationtests/test/org/eclipse/papyrus/layers/integrationtests/LayersStateAfterReloadTest.java

diff --git a/layers/org.eclipse.papyrus.layers.integrationtests/test/org/eclipse/papyrus/layers/integrationtests/LayersStateAfterReloadTest.java b/layers/tests/org.eclipse.papyrus.layers.integrationtests/test/org/eclipse/papyrus/layers/integrationtests/LayersStateAfterReloadTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.integrationtests/test/org/eclipse/papyrus/layers/integrationtests/LayersStateAfterReloadTest.java
rename to layers/tests/org.eclipse.papyrus.layers.integrationtests/test/org/eclipse/papyrus/layers/integrationtests/LayersStateAfterReloadTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/.classpath

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/.classpath b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/.classpath
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/.classpath
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/.classpath

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/.project

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/.project b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/.project
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/.project
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/.project

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/.settings/org.eclipse.jdt.core.prefs

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/.settings/org.eclipse.jdt.core.prefs b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/.settings/org.eclipse.jdt.core.prefs
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/.settings/org.eclipse.jdt.core.prefs

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/.settings/org.eclipse.jdt.ui.prefs

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/.settings/org.eclipse.jdt.ui.prefs b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/.settings/org.eclipse.jdt.ui.prefs
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/.settings/org.eclipse.jdt.ui.prefs

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/META-INF/MANIFEST.MF

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/META-INF/MANIFEST.MF b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/META-INF/MANIFEST.MF
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/META-INF/MANIFEST.MF

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/about.html

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/about.html b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/about.html
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/about.html
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/about.html

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/build.properties

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/build.properties b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/build.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/build.properties
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/build.properties

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/plugin.properties

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/plugin.properties b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/plugin.properties
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/plugin.properties
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/plugin.properties

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/AbstractLayerOperatorTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/AbstractLayerOperatorTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/AbstractLayerOperatorTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/AbstractLayerOperatorTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/AbstractLayerOperatorTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/AbstractLayerTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/AbstractLayerTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/AbstractLayerTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/AbstractLayerTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/AbstractLayerTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/AllViewsDerivedLayerTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/AllViewsDerivedLayerTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/AllViewsDerivedLayerTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/AllViewsDerivedLayerTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/AllViewsDerivedLayerTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/AndStackedLayerOperatorDescriptorTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/AndStackedLayerOperatorDescriptorTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/AndStackedLayerOperatorDescriptorTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/AndStackedLayerOperatorDescriptorTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/AndStackedLayerOperatorDescriptorTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/ApplicationDependantElementTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/ApplicationDependantElementTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/ApplicationDependantElementTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/ApplicationDependantElementTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/ApplicationDependantElementTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/BooleanInstanceTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/BooleanInstanceTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/BooleanInstanceTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/BooleanInstanceTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/BooleanInstanceTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/BooleanTypeTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/BooleanTypeTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/BooleanTypeTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/BooleanTypeTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/BooleanTypeTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/ColorInstanceTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/ColorInstanceTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/ColorInstanceTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/ColorInstanceTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/ColorInstanceTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/ColorTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/ColorTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/ColorTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/ColorTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/ColorTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/ComputePropertyValueCommandItfTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/ComputePropertyValueCommandItfTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/ComputePropertyValueCommandItfTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/ComputePropertyValueCommandItfTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/ComputePropertyValueCommandItfTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/CustomLayerOperatorTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/CustomLayerOperatorTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/CustomLayerOperatorTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/CustomLayerOperatorTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/CustomLayerOperatorTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/CustomPropertyOperatorTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/CustomPropertyOperatorTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/CustomPropertyOperatorTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/CustomPropertyOperatorTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/CustomPropertyOperatorTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/CustomTypeTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/CustomTypeTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/CustomTypeTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/CustomTypeTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/CustomTypeTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/DefaultPropertyOperatorTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/DefaultPropertyOperatorTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/DefaultPropertyOperatorTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/DefaultPropertyOperatorTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/DefaultPropertyOperatorTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FillInstanceTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FillInstanceTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FillInstanceTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FillInstanceTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FillInstanceTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FillPropertySetterTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FillPropertySetterTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FillPropertySetterTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FillPropertySetterTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FillPropertySetterTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FillTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FillTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FillTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FillTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FillTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FolderElementTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FolderElementTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FolderElementTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FolderElementTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FolderElementTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FolderTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FolderTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FolderTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FolderTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FolderTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FontInstanceTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FontInstanceTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FontInstanceTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FontInstanceTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FontInstanceTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FontPropertySetterTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FontPropertySetterTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FontPropertySetterTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FontPropertySetterTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FontPropertySetterTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FontTypeTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FontTypeTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FontTypeTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FontTypeTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/FontTypeTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IntInstanceTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IntInstanceTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IntInstanceTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IntInstanceTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IntInstanceTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IntTypeTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IntTypeTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IntTypeTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IntTypeTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IntTypeTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IsAbstractUmlSetterTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IsAbstractUmlSetterTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IsAbstractUmlSetterTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IsAbstractUmlSetterTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IsAbstractUmlSetterTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IsValidPropertySetterTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IsValidPropertySetterTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IsValidPropertySetterTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IsValidPropertySetterTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IsValidPropertySetterTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IsVisiblePropertySetterTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IsVisiblePropertySetterTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IsVisiblePropertySetterTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IsVisiblePropertySetterTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/IsVisiblePropertySetterTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerApplicationFactoryTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerApplicationFactoryTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerApplicationFactoryTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerApplicationFactoryTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerApplicationFactoryTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerDescriptorRegistryTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerDescriptorRegistryTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerDescriptorRegistryTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerDescriptorRegistryTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerDescriptorRegistryTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerDescriptorTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerDescriptorTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerDescriptorTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerDescriptorTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerDescriptorTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerExpressionTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerExpressionTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerExpressionTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerExpressionTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerExpressionTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerNamedStyleTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerNamedStyleTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerNamedStyleTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerNamedStyleTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerNamedStyleTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerOperatorDescriptorRegistryTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerOperatorDescriptorRegistryTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerOperatorDescriptorRegistryTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerOperatorDescriptorRegistryTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerOperatorDescriptorRegistryTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerOperatorDescriptorTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerOperatorDescriptorTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerOperatorDescriptorTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerOperatorDescriptorTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerOperatorDescriptorTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerOperatorTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerOperatorTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerOperatorTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerOperatorTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerOperatorTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerStackDescriptorRegistryTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerStackDescriptorRegistryTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerStackDescriptorRegistryTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerStackDescriptorRegistryTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerStackDescriptorRegistryTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayerTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersAllTests.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersAllTests.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersAllTests.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersAllTests.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersAllTests.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersContainerTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersContainerTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersContainerTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersContainerTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersContainerTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersExample.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersExample.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersExample.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersExample.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersExample.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersStackApplicationTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersStackApplicationTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersStackApplicationTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersStackApplicationTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersStackApplicationTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersStackTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersStackTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersStackTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersStackTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersStackTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersTests.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersTests.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersTests.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersTests.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LayersTests.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LineInstanceTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LineInstanceTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LineInstanceTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LineInstanceTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LineInstanceTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LinePropertySetterTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LinePropertySetterTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LinePropertySetterTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LinePropertySetterTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LinePropertySetterTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LineTypeTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LineTypeTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LineTypeTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LineTypeTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/LineTypeTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/MetamodelTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/MetamodelTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/MetamodelTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/MetamodelTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/MetamodelTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/NullInstanceTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/NullInstanceTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/NullInstanceTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/NullInstanceTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/NullInstanceTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/NullPropertySetterTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/NullPropertySetterTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/NullPropertySetterTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/NullPropertySetterTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/NullPropertySetterTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/OrStackedLayerOperatorDescriptorTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/OrStackedLayerOperatorDescriptorTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/OrStackedLayerOperatorDescriptorTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/OrStackedLayerOperatorDescriptorTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/OrStackedLayerOperatorDescriptorTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertyIndexTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertyIndexTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertyIndexTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertyIndexTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertyIndexTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertyOperatorTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertyOperatorTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertyOperatorTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertyOperatorTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertyOperatorTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertyRegistryTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertyRegistryTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertyRegistryTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertyRegistryTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertyRegistryTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertySetterRegistryTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertySetterRegistryTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertySetterRegistryTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertySetterRegistryTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertySetterRegistryTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertySetterTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertySetterTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertySetterTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertySetterTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertySetterTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertyTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertyTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertyTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertyTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/PropertyTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/RegExpLayerDescriptorTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/RegExpLayerDescriptorTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/RegExpLayerDescriptorTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/RegExpLayerDescriptorTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/RegExpLayerDescriptorTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/RegExpLayerTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/RegExpLayerTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/RegExpLayerTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/RegExpLayerTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/RegExpLayerTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/SimpleLayerDescriptorTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/SimpleLayerDescriptorTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/SimpleLayerDescriptorTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/SimpleLayerDescriptorTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/SimpleLayerDescriptorTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StackedLayerOperatorDescriptorTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StackedLayerOperatorDescriptorTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StackedLayerOperatorDescriptorTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StackedLayerOperatorDescriptorTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StackedLayerOperatorDescriptorTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StackedLayerOperatorTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StackedLayerOperatorTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StackedLayerOperatorTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StackedLayerOperatorTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StackedLayerOperatorTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringInstanceTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringInstanceTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringInstanceTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringInstanceTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringInstanceTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringToPropertyIndexMapTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringToPropertyIndexMapTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringToPropertyIndexMapTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringToPropertyIndexMapTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringToPropertyIndexMapTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringToPropertySetterTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringToPropertySetterTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringToPropertySetterTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringToPropertySetterTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringToPropertySetterTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringToTypeInstanceMapTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringToTypeInstanceMapTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringToTypeInstanceMapTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringToTypeInstanceMapTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringToTypeInstanceMapTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringToTypeMapTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringToTypeMapTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringToTypeMapTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringToTypeMapTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringToTypeMapTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringTypeTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringTypeTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringTypeTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringTypeTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/StringTypeTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TopLayerOperatorDescriptorTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TopLayerOperatorDescriptorTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TopLayerOperatorDescriptorTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TopLayerOperatorDescriptorTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TopLayerOperatorDescriptorTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TopLayerOperatorTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TopLayerOperatorTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TopLayerOperatorTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TopLayerOperatorTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TopLayerOperatorTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TypeInstanceTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TypeInstanceTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TypeInstanceTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TypeInstanceTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TypeInstanceTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TypeRegistryTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TypeRegistryTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TypeRegistryTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TypeRegistryTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TypeRegistryTest.java

layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TypeTest.java

diff --git a/layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TypeTest.java b/layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TypeTest.java
similarity index 100%
rename from layers/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TypeTest.java
rename to layers/tests/org.eclipse.papyrus.layers.stackmodel.tests/src/org/eclipse/papyrus/layers/stackmodel/layers/tests/TypeTest.java

layers/tests/pom.xml

diff --git a/layers/tests/pom.xml b/layers/tests/pom.xml
new file mode 100755
index 0000000..0b89419
--- /dev/null
+++ b/layers/tests/pom.xml
@@ -0,0 +1,22 @@
+<?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.incubation.layers</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.layers.parent</artifactId>	
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.elk.tests</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<!-- FIXME present in Papyrus core repo but not in the build 
+		org.eclipse.papyrus.layers.integrationtests
+		org.eclipse.papyrus.layers.stackmodel.tests
+		-->
+	</modules>	
+	
+</project>
\ No newline at end of file

pom.xml

diff --git a/pom.xml b/pom.xml
index 9bd260d..011108e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2,13 +2,14 @@
 <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>
-	<groupId>org.eclipse.papyrus</groupId>
-	<artifactId>org.eclipse.papyrus.incubation</artifactId>
-	<version>3.0.0-SNAPSHOT</version>
+	
+	<groupId>org.eclipse.papyrus.incubation</groupId>
+	<artifactId>org.eclipse.papyrus.incubation.all</artifactId>
+	<version>3.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<modules>
-		<module>umlexport</module>
+		<module>uml.export</module>
 		<module>refactoring</module>
 		<module>diagramtemplate</module>
 		<module>alf</module>
@@ -282,7 +283,7 @@
 					<useUIHarness>true</useUIHarness>
 					<useUIThread>true</useUIThread>
 					<!--<showEclipseLog>true</showEclipseLog> -->
-					<!--<testFailureIgnore>true</testFailureIgnore> -->
+					<testFailureIgnore>true</testFailureIgnore>
 					<jvmArgs>
 						<args>${ui.test.vmargs}</args>
 					</jvmArgs>
@@ -350,9 +351,9 @@
 	      </modules>
 	      
 	      <properties>
-			<targetplatform.groupId>org.eclipse.papyrus</targetplatform.groupId>
+			<targetplatform.groupId>org.eclipse.papyrus.incubation</targetplatform.groupId>
 			<targetplatform.artifactId>org.eclipse.papyrus.incubation.targetplatform.oxygen</targetplatform.artifactId>
-			<targetplatform.version>3.0.0-SNAPSHOT</targetplatform.version>
+			<targetplatform.version>3.1.0-SNAPSHOT</targetplatform.version>
 	      </properties>
 	   
 	    </profile>

refactoring/features/org.eclipse.papyrus.refactoring.feature/.project

diff --git a/refactoring/org.eclipse.papyrus.refactoring.feature/.project b/refactoring/features/org.eclipse.papyrus.refactoring.feature/.project
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.feature/.project
rename to refactoring/features/org.eclipse.papyrus.refactoring.feature/.project

refactoring/features/org.eclipse.papyrus.refactoring.feature/build.properties

diff --git a/refactoring/org.eclipse.papyrus.refactoring.feature/build.properties b/refactoring/features/org.eclipse.papyrus.refactoring.feature/build.properties
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.feature/build.properties
rename to refactoring/features/org.eclipse.papyrus.refactoring.feature/build.properties

refactoring/features/org.eclipse.papyrus.refactoring.feature/epl-v10.html

diff --git a/refactoring/org.eclipse.papyrus.refactoring.feature/epl-v10.html b/refactoring/features/org.eclipse.papyrus.refactoring.feature/epl-v10.html
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.feature/epl-v10.html
rename to refactoring/features/org.eclipse.papyrus.refactoring.feature/epl-v10.html

refactoring/features/org.eclipse.papyrus.refactoring.feature/feature.properties

diff --git a/refactoring/org.eclipse.papyrus.refactoring.feature/feature.properties b/refactoring/features/org.eclipse.papyrus.refactoring.feature/feature.properties
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.feature/feature.properties
rename to refactoring/features/org.eclipse.papyrus.refactoring.feature/feature.properties

refactoring/features/org.eclipse.papyrus.refactoring.feature/feature.xml

diff --git a/refactoring/org.eclipse.papyrus.refactoring.feature/feature.xml b/refactoring/features/org.eclipse.papyrus.refactoring.feature/feature.xml
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.feature/feature.xml
rename to refactoring/features/org.eclipse.papyrus.refactoring.feature/feature.xml

refactoring/features/org.eclipse.papyrus.refactoring.feature/license.html

diff --git a/refactoring/org.eclipse.papyrus.refactoring.feature/license.html b/refactoring/features/org.eclipse.papyrus.refactoring.feature/license.html
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.feature/license.html
rename to refactoring/features/org.eclipse.papyrus.refactoring.feature/license.html

refactoring/features/org.eclipse.papyrus.refactoring.feature/pom.xml

diff --git a/refactoring/features/org.eclipse.papyrus.refactoring.feature/pom.xml b/refactoring/features/org.eclipse.papyrus.refactoring.feature/pom.xml
new file mode 100644
index 0000000..808e4d7
--- /dev/null
+++ b/refactoring/features/org.eclipse.papyrus.refactoring.feature/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.incubation.refactoring</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.refactoring.features</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>org.eclipse.papyrus.refactoring.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+	
+</project>
\ No newline at end of file

refactoring/features/pom.xml

diff --git a/refactoring/features/pom.xml b/refactoring/features/pom.xml
new file mode 100755
index 0000000..f18b489
--- /dev/null
+++ b/refactoring/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.incubation.refactoring</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.refactoring.parent</artifactId>		
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.refactoring.features</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.refactoring.feature</module>
+	</modules>	
+	
+</project>
\ No newline at end of file

refactoring/org.eclipse.papyrus.refactoring.feature/pom.xml

diff --git a/refactoring/org.eclipse.papyrus.refactoring.feature/pom.xml b/refactoring/org.eclipse.papyrus.refactoring.feature/pom.xml
deleted file mode 100644
index 5ffe9cc..0000000
--- a/refactoring/org.eclipse.papyrus.refactoring.feature/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.refactoring.parent</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.refactoring.feature</artifactId>
-	<packaging>eclipse-feature</packaging>
-</project>
\ No newline at end of file

refactoring/plugins/org.eclipse.papyrus.refactoring/.classpath

diff --git a/refactoring/org.eclipse.papyrus.refactoring/.classpath b/refactoring/plugins/org.eclipse.papyrus.refactoring/.classpath
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/.classpath
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/.classpath

refactoring/plugins/org.eclipse.papyrus.refactoring/.project

diff --git a/refactoring/org.eclipse.papyrus.refactoring/.project b/refactoring/plugins/org.eclipse.papyrus.refactoring/.project
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/.project
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/.project

refactoring/plugins/org.eclipse.papyrus.refactoring/.settings/org.eclipse.jdt.core.prefs

diff --git a/refactoring/org.eclipse.papyrus.refactoring/.settings/org.eclipse.jdt.core.prefs b/refactoring/plugins/org.eclipse.papyrus.refactoring/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/.settings/org.eclipse.jdt.core.prefs
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/.settings/org.eclipse.jdt.core.prefs

refactoring/plugins/org.eclipse.papyrus.refactoring/META-INF/MANIFEST.MF

diff --git a/refactoring/org.eclipse.papyrus.refactoring/META-INF/MANIFEST.MF b/refactoring/plugins/org.eclipse.papyrus.refactoring/META-INF/MANIFEST.MF
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/META-INF/MANIFEST.MF
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/META-INF/MANIFEST.MF

refactoring/plugins/org.eclipse.papyrus.refactoring/about.html

diff --git a/refactoring/org.eclipse.papyrus.refactoring/about.html b/refactoring/plugins/org.eclipse.papyrus.refactoring/about.html
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/about.html
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/about.html

refactoring/plugins/org.eclipse.papyrus.refactoring/build.properties

diff --git a/refactoring/org.eclipse.papyrus.refactoring/build.properties b/refactoring/plugins/org.eclipse.papyrus.refactoring/build.properties
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/build.properties
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/build.properties

refactoring/plugins/org.eclipse.papyrus.refactoring/doc/Dev_doc.html

diff --git a/refactoring/org.eclipse.papyrus.refactoring/doc/Dev_doc.html b/refactoring/plugins/org.eclipse.papyrus.refactoring/doc/Dev_doc.html
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/doc/Dev_doc.html
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/doc/Dev_doc.html

refactoring/plugins/org.eclipse.papyrus.refactoring/doc/Dev_doc.mediawiki

diff --git a/refactoring/org.eclipse.papyrus.refactoring/doc/Dev_doc.mediawiki b/refactoring/plugins/org.eclipse.papyrus.refactoring/doc/Dev_doc.mediawiki
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/doc/Dev_doc.mediawiki
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/doc/Dev_doc.mediawiki

refactoring/plugins/org.eclipse.papyrus.refactoring/doc/Dev_user.html

diff --git a/refactoring/org.eclipse.papyrus.refactoring/doc/Dev_user.html b/refactoring/plugins/org.eclipse.papyrus.refactoring/doc/Dev_user.html
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/doc/Dev_user.html
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/doc/Dev_user.html

refactoring/plugins/org.eclipse.papyrus.refactoring/doc/Dev_user.mediawiki

diff --git a/refactoring/org.eclipse.papyrus.refactoring/doc/Dev_user.mediawiki b/refactoring/plugins/org.eclipse.papyrus.refactoring/doc/Dev_user.mediawiki
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/doc/Dev_user.mediawiki
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/doc/Dev_user.mediawiki

refactoring/plugins/org.eclipse.papyrus.refactoring/doc/images/example-model.png

diff --git a/refactoring/org.eclipse.papyrus.refactoring/doc/images/example-model.png b/refactoring/plugins/org.eclipse.papyrus.refactoring/doc/images/example-model.png
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/doc/images/example-model.png
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/doc/images/example-model.png
Binary files differ

refactoring/plugins/org.eclipse.papyrus.refactoring/doc/images/preview-page.png

diff --git a/refactoring/org.eclipse.papyrus.refactoring/doc/images/preview-page.png b/refactoring/plugins/org.eclipse.papyrus.refactoring/doc/images/preview-page.png
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/doc/images/preview-page.png
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/doc/images/preview-page.png
Binary files differ

refactoring/plugins/org.eclipse.papyrus.refactoring/doc/images/refactored-model.png

diff --git a/refactoring/org.eclipse.papyrus.refactoring/doc/images/refactored-model.png b/refactoring/plugins/org.eclipse.papyrus.refactoring/doc/images/refactored-model.png
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/doc/images/refactored-model.png
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/doc/images/refactored-model.png
Binary files differ

refactoring/plugins/org.eclipse.papyrus.refactoring/doc/images/validity-page.png

diff --git a/refactoring/org.eclipse.papyrus.refactoring/doc/images/validity-page.png b/refactoring/plugins/org.eclipse.papyrus.refactoring/doc/images/validity-page.png
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/doc/images/validity-page.png
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/doc/images/validity-page.png
Binary files differ

refactoring/plugins/org.eclipse.papyrus.refactoring/doc/images/wizard-refactoring.png

diff --git a/refactoring/org.eclipse.papyrus.refactoring/doc/images/wizard-refactoring.png b/refactoring/plugins/org.eclipse.papyrus.refactoring/doc/images/wizard-refactoring.png
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/doc/images/wizard-refactoring.png
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/doc/images/wizard-refactoring.png
Binary files differ

refactoring/plugins/org.eclipse.papyrus.refactoring/doc/refactoring_dev_guide.xml

diff --git a/refactoring/org.eclipse.papyrus.refactoring/doc/refactoring_dev_guide.xml b/refactoring/plugins/org.eclipse.papyrus.refactoring/doc/refactoring_dev_guide.xml
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/doc/refactoring_dev_guide.xml
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/doc/refactoring_dev_guide.xml

refactoring/plugins/org.eclipse.papyrus.refactoring/doc/refactoring_user_guide.xml

diff --git a/refactoring/org.eclipse.papyrus.refactoring/doc/refactoring_user_guide.xml b/refactoring/plugins/org.eclipse.papyrus.refactoring/doc/refactoring_user_guide.xml
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/doc/refactoring_user_guide.xml
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/doc/refactoring_user_guide.xml

refactoring/plugins/org.eclipse.papyrus.refactoring/icons/Papyrus_16x16.gif

diff --git a/refactoring/org.eclipse.papyrus.refactoring/icons/Papyrus_16x16.gif b/refactoring/plugins/org.eclipse.papyrus.refactoring/icons/Papyrus_16x16.gif
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/icons/Papyrus_16x16.gif
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/icons/Papyrus_16x16.gif
Binary files differ

refactoring/plugins/org.eclipse.papyrus.refactoring/icons/refactor.png

diff --git a/refactoring/org.eclipse.papyrus.refactoring/icons/refactor.png b/refactoring/plugins/org.eclipse.papyrus.refactoring/icons/refactor.png
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/icons/refactor.png
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/icons/refactor.png
Binary files differ

refactoring/plugins/org.eclipse.papyrus.refactoring/plugin.properties

diff --git a/refactoring/org.eclipse.papyrus.refactoring/plugin.properties b/refactoring/plugins/org.eclipse.papyrus.refactoring/plugin.properties
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/plugin.properties
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/plugin.properties

refactoring/plugins/org.eclipse.papyrus.refactoring/plugin.xml

diff --git a/refactoring/org.eclipse.papyrus.refactoring/plugin.xml b/refactoring/plugins/org.eclipse.papyrus.refactoring/plugin.xml
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/plugin.xml
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/plugin.xml

refactoring/plugins/org.eclipse.papyrus.refactoring/pom.xml

diff --git a/refactoring/org.eclipse.papyrus.refactoring/pom.xml b/refactoring/plugins/org.eclipse.papyrus.refactoring/pom.xml
similarity index 90%
rename from refactoring/org.eclipse.papyrus.refactoring/pom.xml
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/pom.xml
index 8a04a78..2508908 100755
--- a/refactoring/org.eclipse.papyrus.refactoring/pom.xml
+++ b/refactoring/plugins/org.eclipse.papyrus.refactoring/pom.xml
@@ -3,13 +3,16 @@
 	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.incubation.refactoring</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.refactoring.plugins</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+
 	<artifactId>org.eclipse.papyrus.refactoring</artifactId>
 	<packaging>eclipse-plugin</packaging>	
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.refactoring.parent</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>		
+
 	<build>
 		<plugins>
 			<plugin>

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/Activator.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/Activator.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/Activator.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/Activator.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/Activator.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/AbstractPapyrusTransformation.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/AbstractPapyrusTransformation.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/AbstractPapyrusTransformation.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/AbstractPapyrusTransformation.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/AbstractPapyrusTransformation.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/IPreviewablePapyrusChange.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/IPreviewablePapyrusChange.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/IPreviewablePapyrusChange.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/IPreviewablePapyrusChange.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/IPreviewablePapyrusChange.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusChange.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusChange.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusChange.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusChange.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusChange.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusRefactoring.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusRefactoring.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusRefactoring.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusRefactoring.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusRefactoring.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusRefactoringCommand.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusRefactoringCommand.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusRefactoringCommand.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusRefactoringCommand.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusRefactoringCommand.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusRefactoringOperation.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusRefactoringOperation.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusRefactoringOperation.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusRefactoringOperation.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusRefactoringOperation.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusRefactoringValidationStatusContext.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusRefactoringValidationStatusContext.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusRefactoringValidationStatusContext.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusRefactoringValidationStatusContext.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/PapyrusRefactoringValidationStatusContext.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/UndoPapyrusChange.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/UndoPapyrusChange.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/UndoPapyrusChange.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/UndoPapyrusChange.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/core/UndoPapyrusChange.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/helper/AbstractAllModelTransformation.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/helper/AbstractAllModelTransformation.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/helper/AbstractAllModelTransformation.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/helper/AbstractAllModelTransformation.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/helper/AbstractAllModelTransformation.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/helper/AbstractChoiceOnUIParticipantsTransformation.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/helper/AbstractChoiceOnUIParticipantsTransformation.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/helper/AbstractChoiceOnUIParticipantsTransformation.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/helper/AbstractChoiceOnUIParticipantsTransformation.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/helper/AbstractChoiceOnUIParticipantsTransformation.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/helper/AbstractSelectedElementsTransformation.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/helper/AbstractSelectedElementsTransformation.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/helper/AbstractSelectedElementsTransformation.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/helper/AbstractSelectedElementsTransformation.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/helper/AbstractSelectedElementsTransformation.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/messages/Messages.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/messages/Messages.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/messages/Messages.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/messages/Messages.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/messages/Messages.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/messages/messages.properties

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/messages/messages.properties b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/messages/messages.properties
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/messages/messages.properties
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/messages/messages.properties

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/AbstractTransformationOnElement.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/AbstractTransformationOnElement.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/AbstractTransformationOnElement.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/AbstractTransformationOnElement.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/AbstractTransformationOnElement.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/ITransformationOnElement.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/ITransformationOnElement.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/ITransformationOnElement.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/ITransformationOnElement.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/ITransformationOnElement.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/PapyrusCompositeChange.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/PapyrusCompositeChange.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/PapyrusCompositeChange.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/PapyrusCompositeChange.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/PapyrusCompositeChange.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/PapyrusRefactoringOnElementChange.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/PapyrusRefactoringOnElementChange.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/PapyrusRefactoringOnElementChange.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/PapyrusRefactoringOnElementChange.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/PapyrusRefactoringOnElementChange.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/ReplaceTransformationOnElement.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/ReplaceTransformationOnElement.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/ReplaceTransformationOnElement.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/ReplaceTransformationOnElement.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/refactoringOnElement/ReplaceTransformationOnElement.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/ui/PapyrusRefactoringPreview.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/ui/PapyrusRefactoringPreview.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/ui/PapyrusRefactoringPreview.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/ui/PapyrusRefactoringPreview.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/ui/PapyrusRefactoringPreview.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/ui/PapyrusRefactoringWizard.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/ui/PapyrusRefactoringWizard.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/ui/PapyrusRefactoringWizard.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/ui/PapyrusRefactoringWizard.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/ui/PapyrusRefactoringWizard.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/ui/PapyrusStatusContextViewer.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/ui/PapyrusStatusContextViewer.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/ui/PapyrusStatusContextViewer.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/ui/PapyrusStatusContextViewer.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/ui/PapyrusStatusContextViewer.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/ui/ReplaceRefactoring.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/ui/ReplaceRefactoring.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/ui/ReplaceRefactoring.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/ui/ReplaceRefactoring.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/ui/ReplaceRefactoring.java

refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/util/PapyrusRefactoringUtils.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/util/PapyrusRefactoringUtils.java b/refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/util/PapyrusRefactoringUtils.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/util/PapyrusRefactoringUtils.java
rename to refactoring/plugins/org.eclipse.papyrus.refactoring/src/org/eclipse/papyrus/refactoring/util/PapyrusRefactoringUtils.java

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/.classpath

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/.classpath b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/.classpath
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/.classpath
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/.classpath

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/.project

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/.project b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/.project
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/.project
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/.project

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/.settings/org.eclipse.jdt.core.prefs

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/.settings/org.eclipse.jdt.core.prefs b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/.settings/org.eclipse.jdt.core.prefs
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/.settings/org.eclipse.jdt.core.prefs

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/META-INF/MANIFEST.MF

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/META-INF/MANIFEST.MF b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/META-INF/MANIFEST.MF
similarity index 93%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/META-INF/MANIFEST.MF
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/META-INF/MANIFEST.MF
index a5c9015..5e30d58 100755
--- a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/META-INF/MANIFEST.MF
+++ b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/META-INF/MANIFEST.MF
@@ -29,8 +29,7 @@
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.papyrus.commands,
  org.eclipse.papyrus.infra.services.labelprovider.service,
- org.eclipse.papyrus.infra.services.labelprovider.service.impl,
- org.eclipse.papyrus.uml.diagram.profile.custom.requests
+ org.eclipse.papyrus.infra.services.labelprovider.service.impl
 Bundle-Vendor: %vendorName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.papyrus.uml.refactoring.mutation.helper,

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/about.html

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/about.html b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/about.html
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/about.html
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/about.html

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/build.properties

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/build.properties b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/build.properties
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/build.properties
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/build.properties

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/doc/images/mutate.png

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/doc/images/mutate.png b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/doc/images/mutate.png
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/doc/images/mutate.png
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/doc/images/mutate.png
Binary files differ

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/doc/mutate-toc.xml

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/doc/mutate-toc.xml b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/doc/mutate-toc.xml
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/doc/mutate-toc.xml
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/doc/mutate-toc.xml

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/doc/mutate.html

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/doc/mutate.html b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/doc/mutate.html
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/doc/mutate.html
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/doc/mutate.html

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/doc/mutate.mediawiki

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/doc/mutate.mediawiki b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/doc/mutate.mediawiki
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/doc/mutate.mediawiki
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/doc/mutate.mediawiki

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/icons/refactor.png

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/icons/refactor.png b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/icons/refactor.png
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/icons/refactor.png
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/icons/refactor.png
Binary files differ

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/plugin.properties

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/plugin.properties b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/plugin.properties
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/plugin.properties
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/plugin.properties

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/plugin.xml

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/plugin.xml b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/plugin.xml
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/plugin.xml
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/plugin.xml

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/pom.xml

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/pom.xml b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/pom.xml
similarity index 91%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/pom.xml
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/pom.xml
index aaaa142..c78e0e2 100755
--- a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/pom.xml
+++ b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/pom.xml
@@ -3,13 +3,15 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.eclipse.papyrus.uml.refactoring.mutation</artifactId>
-	<packaging>eclipse-plugin</packaging>
+	
 	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.refactoring.parent</artifactId>
+		<groupId>org.eclipse.papyrus.incubation.refactoring</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.refactoring.plugins</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
+
+	<artifactId>org.eclipse.papyrus.uml.refactoring.mutation</artifactId>
+	<packaging>eclipse-plugin</packaging>
 	
 	<build>
 		<plugins>

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/Activator.java

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/Activator.java b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/Activator.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/Activator.java
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/Activator.java

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/handler/MutationHandler.java

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/handler/MutationHandler.java b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/handler/MutationHandler.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/handler/MutationHandler.java
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/handler/MutationHandler.java

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/helper/MutationTransformation.java

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/helper/MutationTransformation.java b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/helper/MutationTransformation.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/helper/MutationTransformation.java
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/helper/MutationTransformation.java

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/messages/Messages.java

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/messages/Messages.java b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/messages/Messages.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/messages/Messages.java
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/messages/Messages.java

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/messages/messages.properties

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/messages/messages.properties b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/messages/messages.properties
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/messages/messages.properties
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/messages/messages.properties

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/providers/ElemenetTypeContentProvider.java

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/providers/ElemenetTypeContentProvider.java b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/providers/ElemenetTypeContentProvider.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/providers/ElemenetTypeContentProvider.java
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/providers/ElemenetTypeContentProvider.java

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/providers/ElementTypeLabelProvider.java

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/providers/ElementTypeLabelProvider.java b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/providers/ElementTypeLabelProvider.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/providers/ElementTypeLabelProvider.java
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/providers/ElementTypeLabelProvider.java

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/ui/MutationRefactoring.java

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/ui/MutationRefactoring.java b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/ui/MutationRefactoring.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/ui/MutationRefactoring.java
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/ui/MutationRefactoring.java

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/utils/ElementCreationUtils.java

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/utils/ElementCreationUtils.java b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/utils/ElementCreationUtils.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/utils/ElementCreationUtils.java
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/utils/ElementCreationUtils.java

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/utils/ModelNotationUtils.java

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/utils/ModelNotationUtils.java b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/utils/ModelNotationUtils.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/utils/ModelNotationUtils.java
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.mutation/src/org/eclipse/papyrus/uml/refactoring/mutation/utils/ModelNotationUtils.java

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/.classpath

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/.classpath b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/.classpath
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/.classpath
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/.classpath

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/.project

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/.project b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/.project
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/.project
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/.project

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/.settings/org.eclipse.jdt.core.prefs

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/.settings/org.eclipse.jdt.core.prefs b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/.settings/org.eclipse.jdt.core.prefs
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/.settings/org.eclipse.jdt.core.prefs

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/META-INF/MANIFEST.MF

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/META-INF/MANIFEST.MF b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/META-INF/MANIFEST.MF
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/META-INF/MANIFEST.MF
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/META-INF/MANIFEST.MF

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/about.html

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/about.html b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/about.html
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/about.html
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/about.html

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/build.properties

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/build.properties b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/build.properties
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/build.properties
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/build.properties

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/icons/refactor.png

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/icons/refactor.png b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/icons/refactor.png
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/icons/refactor.png
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/icons/refactor.png
Binary files differ

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/icons/transformationIcon.gif

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/icons/transformationIcon.gif b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/icons/transformationIcon.gif
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/icons/transformationIcon.gif
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/icons/transformationIcon.gif
Binary files differ

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/plugin.properties

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/plugin.properties b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/plugin.properties
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/plugin.properties
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/plugin.properties

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/plugin.xml

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/plugin.xml b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/plugin.xml
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/plugin.xml
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/plugin.xml

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/pom.xml

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/pom.xml b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/pom.xml
similarity index 76%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/pom.xml
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/pom.xml
index 751854b..692cccf 100755
--- a/refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/pom.xml
+++ b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/pom.xml
@@ -3,11 +3,14 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.eclipse.papyrus.uml.refactoring.qvtTransformation</artifactId>
-	<packaging>eclipse-plugin</packaging>
+	
 	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.refactoring.parent</artifactId>
+		<groupId>org.eclipse.papyrus.incubation.refactoring</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.refactoring.plugins</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
+
+	<artifactId>org.eclipse.papyrus.uml.refactoring.qvtTransformation</artifactId>
+	<packaging>eclipse-plugin</packaging>
+
 </project>

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/src/org/eclipse/papyrus/refactoring/qvttransformation/Activator.java

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/src/org/eclipse/papyrus/refactoring/qvttransformation/Activator.java b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/src/org/eclipse/papyrus/refactoring/qvttransformation/Activator.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/src/org/eclipse/papyrus/refactoring/qvttransformation/Activator.java
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/src/org/eclipse/papyrus/refactoring/qvttransformation/Activator.java

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/src/org/eclipse/papyrus/refactoring/qvttransformation/handler/SelectQVTTransformationHandler.java

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/src/org/eclipse/papyrus/refactoring/qvttransformation/handler/SelectQVTTransformationHandler.java b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/src/org/eclipse/papyrus/refactoring/qvttransformation/handler/SelectQVTTransformationHandler.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/src/org/eclipse/papyrus/refactoring/qvttransformation/handler/SelectQVTTransformationHandler.java
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/src/org/eclipse/papyrus/refactoring/qvttransformation/handler/SelectQVTTransformationHandler.java

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/src/org/eclipse/papyrus/refactoring/qvttransformation/popup/actions/SelectQVTTransformation.java

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/src/org/eclipse/papyrus/refactoring/qvttransformation/popup/actions/SelectQVTTransformation.java b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/src/org/eclipse/papyrus/refactoring/qvttransformation/popup/actions/SelectQVTTransformation.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.qvtTransformation/src/org/eclipse/papyrus/refactoring/qvttransformation/popup/actions/SelectQVTTransformation.java
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.qvtTransformation/src/org/eclipse/papyrus/refactoring/qvttransformation/popup/actions/SelectQVTTransformation.java

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/.classpath

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.replace/.classpath b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/.classpath
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.replace/.classpath
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/.classpath

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/.project

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.replace/.project b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/.project
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.replace/.project
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/.project

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/.settings/org.eclipse.jdt.core.prefs

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.replace/.settings/org.eclipse.jdt.core.prefs b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.replace/.settings/org.eclipse.jdt.core.prefs
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/.settings/org.eclipse.jdt.core.prefs

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/META-INF/MANIFEST.MF

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.replace/META-INF/MANIFEST.MF b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/META-INF/MANIFEST.MF
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.replace/META-INF/MANIFEST.MF
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/META-INF/MANIFEST.MF

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/about.html

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.replace/about.html b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/about.html
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.replace/about.html
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/about.html

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/build.properties

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.replace/build.properties b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/build.properties
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.replace/build.properties
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/build.properties

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/doc/images/replace.png

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.replace/doc/images/replace.png b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/doc/images/replace.png
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.replace/doc/images/replace.png
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/doc/images/replace.png
Binary files differ

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/doc/replace-toc.xml

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.replace/doc/replace-toc.xml b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/doc/replace-toc.xml
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.replace/doc/replace-toc.xml
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/doc/replace-toc.xml

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/doc/replace.html

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.replace/doc/replace.html b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/doc/replace.html
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.replace/doc/replace.html
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/doc/replace.html

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/doc/replace.mediawiki

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.replace/doc/replace.mediawiki b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/doc/replace.mediawiki
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.replace/doc/replace.mediawiki
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/doc/replace.mediawiki

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/icons/refactor.png

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.replace/icons/refactor.png b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/icons/refactor.png
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.replace/icons/refactor.png
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/icons/refactor.png
Binary files differ

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/plugin.properties

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.replace/plugin.properties b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/plugin.properties
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.replace/plugin.properties
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/plugin.properties

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/plugin.xml

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.replace/plugin.xml b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/plugin.xml
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.replace/plugin.xml
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/plugin.xml

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/pom.xml

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.replace/pom.xml b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/pom.xml
similarity index 91%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.replace/pom.xml
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/pom.xml
index ab0f266..ecd90d5 100755
--- a/refactoring/org.eclipse.papyrus.uml.refactoring.replace/pom.xml
+++ b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/pom.xml
@@ -3,14 +3,16 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.eclipse.papyrus.uml.refactoring.replace</artifactId>
-	<packaging>eclipse-plugin</packaging>
+	
 	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.refactoring.parent</artifactId>
+		<groupId>org.eclipse.papyrus.incubation.refactoring</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.refactoring.plugins</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	
+	<artifactId>org.eclipse.papyrus.uml.refactoring.replace</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	
 	<build>
 		<plugins>
 			<plugin>

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/Activator.java

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/Activator.java b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/Activator.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/Activator.java
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/Activator.java

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/handler/ReplaceHandler.java

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/handler/ReplaceHandler.java b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/handler/ReplaceHandler.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/handler/ReplaceHandler.java
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/handler/ReplaceHandler.java

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/messages/Messages.java

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/messages/Messages.java b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/messages/Messages.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/messages/Messages.java
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/messages/Messages.java

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/messages/messages.properties

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/messages/messages.properties b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/messages/messages.properties
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/messages/messages.properties
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/messages/messages.properties

refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/ui/ReplaceRefactoring.java

diff --git a/refactoring/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/ui/ReplaceRefactoring.java b/refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/ui/ReplaceRefactoring.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/ui/ReplaceRefactoring.java
rename to refactoring/plugins/org.eclipse.papyrus.uml.refactoring.replace/src/org/eclipse/papyrus/uml/refactoring/replace/ui/ReplaceRefactoring.java

refactoring/plugins/pom.xml

diff --git a/refactoring/plugins/pom.xml b/refactoring/plugins/pom.xml
new file mode 100755
index 0000000..aa04893
--- /dev/null
+++ b/refactoring/plugins/pom.xml
@@ -0,0 +1,22 @@
+<?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.incubation.refactoring</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.refactoring.parent</artifactId>	
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.refactoring.plugins</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.refactoring</module>
+		<module>org.eclipse.papyrus.uml.refactoring.mutation</module>
+		<module>org.eclipse.papyrus.uml.refactoring.qvtTransformation</module>
+		<module>org.eclipse.papyrus.uml.refactoring.replace</module>
+	</modules>	
+	
+</project>
\ No newline at end of file

refactoring/pom.xml

diff --git a/refactoring/pom.xml b/refactoring/pom.xml
index 8158be2..db6d0a2 100755
--- a/refactoring/pom.xml
+++ b/refactoring/pom.xml
@@ -1,21 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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</groupId>
-		<artifactId>org.eclipse.papyrus.incubation</artifactId>		
-		<version>3.0.0-SNAPSHOT</version>
+		<groupId>org.eclipse.papyrus.incubation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.all</artifactId>		
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.papyrus.refactoring.parent</artifactId>
+
+	<groupId>org.eclipse.papyrus.incubation.refactoring</groupId>
+	<artifactId>org.eclipse.papyrus.incubation.refactoring.parent</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
+
 	<modules>
-		<module>org.eclipse.papyrus.refactoring</module>
-		<!--FIXME: Already commented in Papyrus core repository <module>org.eclipse.papyrus.refactoring.tests</module>-->
-		<module>org.eclipse.papyrus.uml.refactoring.mutation</module>
-		<module>org.eclipse.papyrus.uml.refactoring.qvtTransformation</module>
-		<module>org.eclipse.papyrus.uml.refactoring.replace</module>
-		<module>org.eclipse.papyrus.refactoring.feature</module>
+		<module>features</module>
+		<module>plugins</module>
+		<module>tests</module>
 	</modules>	
+			
+	<profiles>
+		<profile>
+	      <id>refactoring</id>	
+	     
+		  <properties>
+			<targetplatform.groupId>org.eclipse.papyrus.incubation.refactoring</targetplatform.groupId>
+			<targetplatform.artifactId>org.eclipse.papyrus.incubation.refactoring.targetplatform</targetplatform.artifactId>
+			<targetplatform.version>0.0.1-SNAPSHOT</targetplatform.version>
+		  </properties>
+	            
+	      <modules>
+	      	<module>releng</module>
+	      </modules>
+	    </profile>
+	</profiles>
 	
 </project>
\ No newline at end of file

refactoring/releng/org.eclipse.papyrus.incubation.refactoring.p2/.project

diff --git a/refactoring/releng/org.eclipse.papyrus.incubation.refactoring.p2/.project b/refactoring/releng/org.eclipse.papyrus.incubation.refactoring.p2/.project
new file mode 100755
index 0000000..0a79233
--- /dev/null
+++ b/refactoring/releng/org.eclipse.papyrus.incubation.refactoring.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>

refactoring/releng/org.eclipse.papyrus.incubation.refactoring.p2/category.xml

diff --git a/refactoring/releng/org.eclipse.papyrus.incubation.refactoring.p2/category.xml b/refactoring/releng/org.eclipse.papyrus.incubation.refactoring.p2/category.xml
new file mode 100755
index 0000000..790bd05
--- /dev/null
+++ b/refactoring/releng/org.eclipse.papyrus.incubation.refactoring.p2/category.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+  <feature url="features/org.eclipse.papyrus.refactoring.feature_0.0.1.qualifier.jar" id="org.eclipse.papyrus.refactoring.feature" version="0.0.1.qualifier">
+      <category name="org.eclipse.papyrus.incubation.category"/>
+   </feature>
+   <feature url="features/org.eclipse.papyrus.refactoring.feature.source_0.0.1.qualifier.jar" id="org.eclipse.papyrus.refactoring.feature.source" version="0.0.1.qualifier">
+      <category name="org.eclipse.papyrus.incubation.category"/>
+   </feature>
+  
+  <category-def name="org.eclipse.papyrus.incubation.category" label="Papyrus Incubation">
+      <description>
+         Papyrus Incubation features
+      </description>
+   </category-def>
+</site>

refactoring/releng/org.eclipse.papyrus.incubation.refactoring.p2/pom.xml

diff --git a/refactoring/releng/org.eclipse.papyrus.incubation.refactoring.p2/pom.xml b/refactoring/releng/org.eclipse.papyrus.incubation.refactoring.p2/pom.xml
new file mode 100755
index 0000000..2b5defc
--- /dev/null
+++ b/refactoring/releng/org.eclipse.papyrus.incubation.refactoring.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.incubation.refactoring</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.refactoring.releng</artifactId>		
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.refactoring.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

refactoring/releng/pom.xml

diff --git a/refactoring/releng/pom.xml b/refactoring/releng/pom.xml
new file mode 100755
index 0000000..cc96e76
--- /dev/null
+++ b/refactoring/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.incubation.refactoring</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.refactoring.parent</artifactId>		
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.refactoring.releng</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>targetplatform</module>
+		<module>org.eclipse.papyrus.incubation.refactoring.p2</module>
+	</modules>	
+	
+</project>
\ No newline at end of file

refactoring/releng/promote/dsmlvalidation.sh

diff --git a/refactoring/releng/promote/dsmlvalidation.sh b/refactoring/releng/promote/dsmlvalidation.sh
new file mode 100755
index 0000000..d9ef5de
--- /dev/null
+++ b/refactoring/releng/promote/dsmlvalidation.sh
@@ -0,0 +1,258 @@
+#Based upon Gef4 publish.sh script
+
+#causes the shell to exit if any subcommand or pipeline returns a non-zero status.
+#set -e
+
+# Script may take 5-6 command line parameters:
+# $1: Hudson job name: <name>
+# $2: Hudson build id: <id>
+# $3: Build type: i(ntegration), s(table), r(elease)
+# $4: The release label used to label the drop files, e.g. 3.10.0 or 3.10.1
+# $5: The eclipse target version, e.g. mars or neon
+# $6: Override if exists
+# $7: An optional release label suffix to be appended to drop files name, e.g. M1, RC1 
+
+##Additional variables to specify for each project
+
+#The root url that enables to find the job with ${hudsonJobRootUrl}/$jobName/$buildNumber
+hudsonJobRootUrl="https://hudson.eclipse.org/papyrus/job"
+
+#The name of the tool
+repo="incubation"
+subRepo="refactoring"
+updates="updates"
+drops="downloads/drops"
+
+#The specific localization
+remoteRoot="/home/data/httpd/download.eclipse.org"
+papyrusRoot="modeling/mdt/papyrus"
+remoteUpdateSiteRoot=${remoteRoot}/${papyrusRoot}/${repo}
+remoteUpdateSite=${remoteUpdateSiteRoot}/${subRepo}
+remoteUpdateSiteDir=${remoteUpdateSite}/${updates}
+echo "remoteUpdateSiteDir: $remoteUpdateSiteDir"
+
+#The localization of the local build target
+targetResults="archive/${subRepo}/releng/org.eclipse.papyrus.${repo}.${subRepo}.p2/target/repository"
+echo "targetResults: $targetResults"
+
+#The rcpPrompote.sh script may be used to publish the Incubation build results. 
+#if [ $# -eq 6 -o $# -eq 7  ];
+#then
+#	jobName=$1
+jobName="Papyrus-Incubation-DsmlValidation"
+	echo "jobName: $jobName"
+#	buildNumber=$2
+buildNumber="4"
+	echo "buildNumber: $buildNumber"
+#	releaseType=$3
+releaseType="i"
+	echo "releaseType: $releaseType"
+#	releaseLabel=$4	
+releaseLabel="1.2.0"
+	echo "releaseLabel: $releaseLabel"
+#	eclipseTarget=$5
+eclipseTarget="oxygen"	
+	echo "eclipseTarget: $eclipseTarget"
+#	override=$6	
+override="y"
+	echo "override: $override"
+
+	if [ -n "$7" ];
+	then
+		releaseLabelSuffix=$7
+		echo "releaseLabelSuffix: $releaseLabelSuffix"
+	fi
+#else
+#	echo "Missing so parameters: command jobName buildNumber releaseType releaseLabel eclipseTarget override [releaseLabelSuffix]"
+#	exit 1;
+#fi
+
+###########jobName parameter###########
+if [ -z "$jobName" ];
+then
+	echo "The Hudson job you want to promote must be specified"
+	exit 1
+fi
+
+###########buildNumber parameter###########
+if [ -z "$buildNumber" ];
+then
+	echo "The id of the $jobName build you want to promote must be specified"
+	exit 1
+fi
+
+###########releaseType parameter###########
+if [ -z "$releaseType" ];
+then
+    echo "The type of build you want to publish to [i(integration), s(table), r(elease)]."
+    exit;
+fi
+echo "Publishing as $releaseType build"
+
+###########releaseLabel parameter###########
+if [ -z "$releaseLabel" ];
+then
+    echo "The release label (e.g. 3.10.0, 3.10.1M2) must be specified."
+    exit 1
+fi
+echo "Release label: $releaseLabel"
+
+###########eclipseTarget parameter###########
+if [ -z "$eclipseTarget" ];
+then
+    echo "The Eclipse target (e.g. mars, neon) must be specified."
+    exit 1
+fi
+echo "Eclipse target : $eclipseTarget"
+
+###########Override parameter###########
+if [ "$override" != y -a "$override" != n ];
+then
+	echo "Parameter override has to 'y'(es) or 'n'(o) but was: $override"
+    exit 0
+fi
+
+if [ "$override" == "y" ];
+then
+	echo "Will override the previous artifacts if found"
+else
+	echo "Will not override the previous arifacts if found"
+fi
+
+########### Compute local build results using buildNumber ###########
+if [ "$buildNumber" = "lastStable" -o "$buildNumber" = "lastSuccessful" ];
+then
+	# Reverse lookup the build id (in case lastSuccessful or lastStable was used)
+	for i in $(find ~/.hudson/jobs/$jobName/builds/ -type l)
+	do
+		if [ "$(readlink -f $i)" = "$(readlink -f ~/.hudson/jobs/$jobName/$buildNumber)" ];
+		then
+			buildNumber=${i##*/}
+		fi
+	done
+	echo "Reverse lookup (lastStable/lastSuccessful) yielded buildNumber: $buildNumber"
+fi
+
+echo "~/.hudson/jobs/${jobName}/builds/${buildNumber}"
+jobDir=$(readlink -f ~/.hudson/jobs/${jobName}/builds/${buildNumber})
+if ! [ -d $jobDir ];
+then
+	echo "The specified buildNumber does not refer to an existing build: $buildNumber"
+	exit 1
+fi
+
+localResults=${jobDir}/${targetResults}
+echo "localResults: ${localResults}"
+
+########### Promote Job ###########
+destination=$remoteUpdateSiteDir/$eclipseTarget/${releaseLabel}${releaseLabelSuffix}
+echo "Destination: $destination"
+
+if [ "$override" == "n" ];
+then
+	if [ -d $destination ];
+	then
+		if [ "$(ls -A ${destination})" ];
+		then
+			echo "The destination is not empty. You may consider overriding or archiving"
+			exit 1
+		fi
+	fi
+fi
+
+if [ "$override" == "y" ];
+then
+	if [ -d $destination ];
+	then
+		echo "Overriding the RCP by cleaning the $destination folder"
+		rm -rf ${destination}/*
+	fi
+fi
+
+#Go to the artifact directory
+cd $localResults
+echo "Promoting the Job to $destination"
+#No error if exists, makes parent directories as needed
+mkdir -p $destination
+
+#Copy the contents onto the temp folder and change the permissions
+cp -R * $destination
+
+
+########### Update composites ###########
+# TODO update composite root ./eclipseTarget/* and parent ./*
+echo "Update Composites"
+timestamp=$(date +%s000)
+
+# This function indents the text with two white spaces
+indent() {
+sed 's/^/  /';
+}
+
+# This function is used to generate the composites
+function updateComposites() {
+cat > "compositeArtifacts.xml" <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<repository name="Papyrus" type="org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository" version="1.0.0">
+  <properties size="1">
+    <property name="p2.timestamp" value="$1"/>
+  </properties>
+  <children size="$2">
+$(	
+for file in *; do 
+if [ -d $file ]; then 
+    printf "<child location='${file}'/>" | indent | indent
+fi
+done
+)
+  </children>
+</repository>
+EOF
+
+cat > "compositeContent.xml" <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<repository name="Papyrus" type="org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" version="1.0.0">
+  <properties size="1">
+    <property name="p2.timestamp" value="$1"/>
+  </properties>
+  <children size="$2">
+$(	
+for file in *; do 
+if [ -d $file ]; then 
+    printf "<child location='${file}'/>" | indent | indent
+fi
+done
+)
+  </children>
+</repository>
+EOF
+}
+
+echo "Update root composites: $remoteUpdateSite"
+cd $remoteUpdateSite
+childrenCount=$(find . -maxdepth 1 -type d  \( ! -iname ".*" \) | wc -l)
+updateComposites $timestamp $childrenCount
+
+echo "Update eclipseTarget composites: $remoteUpdateSiteDir"
+cd $remoteUpdateSiteDir
+childrenCount=$(find . -maxdepth 1 -type d  \( ! -iname ".*" \) | wc -l)
+updateComposites $timestamp $childrenCount
+
+echo "Update releaseLabel composites: $remoteUpdateSiteDir/$eclipseTarget"
+cd $remoteUpdateSiteDir/$eclipseTarget
+childrenCount=$(find . -maxdepth 1 -type d  \( ! -iname ".*" \) | wc -l)
+updateComposites $timestamp $childrenCount
+
+
+########### Set Access Rights ###########
+
+# This function sets the acess rights to allow all memebers of the group to edit the files
+function setAccessRights() {
+	chmod -R 775 "$1"
+	chgrp -hR modeling.mdt.papyrus "$1"
+}
+echo "Set access right -R: $remoteUpdateSiteDir"
+setAccessRights $remoteUpdateSiteDir
+
+
+echo "publishing done."
\ No newline at end of file

refactoring/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.refactoring.targetplatform.target

diff --git a/refactoring/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.refactoring.targetplatform.target b/refactoring/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.refactoring.targetplatform.target
new file mode 100755
index 0000000..ff6fffd
--- /dev/null
+++ b/refactoring/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.refactoring.targetplatform.target
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Refactoring - Oxygen" sequenceNumber="1504258030">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ui" version="0.0.0"/>
+      <unit id="org.eclipse.ltk.ui.refactoring" version="0.0.0"/>
+      <unit id="org.eclipse.m2m.qvt.oml.runtime" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.launcher" version="0.0.0"/>
+      <unit id="org.eclipse.ui.ide.application" version="0.0.0"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/releases/oxygen/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.infra.core" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.infra.emf" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.search.ui" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.infra.gmfdiag.common" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.service.types" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.infra.gmfdiag.css" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.diagram.usecase" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.views.modelexplorer.newchild" version="0.0.0"/>
+      <repository id="Papyrus-Oxygen" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.junit.framework" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.junit.utils" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.tests.framework" version="0.0.0"/>
+      <repository id="Papyrus-Oxygen-Developer" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.codegen" version="0.0.0"/>
+      <repository id="gmfTooling" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
+    </location>
+  </locations>
+</target>

refactoring/releng/targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform/.project

diff --git a/refactoring/releng/targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform/.project b/refactoring/releng/targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform/.project
new file mode 100755
index 0000000..7477ea0
--- /dev/null
+++ b/refactoring/releng/targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.incubation.targetplatform.oxygen</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

refactoring/releng/targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform.target

diff --git a/refactoring/releng/targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform.target b/refactoring/releng/targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform.target
new file mode 100755
index 0000000..3844863
--- /dev/null
+++ b/refactoring/releng/targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform.target
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Refactoring - Oxygen" sequenceNumber="1504258030">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ui" version="0.0.0"/>
+      <unit id="org.eclipse.ltk.ui.refactoring" version="0.0.0"/>
+      <unit id="org.eclipse.m2m.qvt.oml.runtime" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.launcher" version="0.0.0"/>
+      <unit id="org.eclipse.ui.ide.application" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/releases/oxygen/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.infra.core" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.infra.emf" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.search.ui" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.infra.gmfdiag.common" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.service.types" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.infra.gmfdiag.css" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.diagram.usecase" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.views.modelexplorer.newchild" version="0.0.0"/>
+      <repository id="Papyrus-Oxygen" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.junit.framework" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.junit.utils" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.tests.framework" version="0.0.0"/>
+      <repository id="Papyrus-Oxygen-Developer" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.codegen" version="0.0.0"/>
+      <repository id="gmfTooling" location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/>
+    </location>
+  </locations>
+</target>

refactoring/releng/targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform.tpd

diff --git a/refactoring/releng/targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform.tpd b/refactoring/releng/targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform.tpd
new file mode 100755
index 0000000..39a446c
--- /dev/null
+++ b/refactoring/releng/targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform.tpd
@@ -0,0 +1,37 @@
+target "Refactoring - Oxygen" with source requirements
+
+location "http://download.eclipse.org/releases/oxygen/" {
+ org.eclipse.ui lazy
+ org.eclipse.ltk.ui.refactoring lazy
+ org.eclipse.m2m.qvt.oml.runtime lazy
+ org.eclipse.equinox.launcher lazy
+ org.eclipse.ui.ide.application lazy
+ 
+}
+
+
+//manualUpdate
+location "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/" Papyrus-Oxygen {
+ org.eclipse.papyrus.infra.core lazy
+ org.eclipse.papyrus.infra.emf lazy
+ org.eclipse.papyrus.uml.search.ui lazy
+ org.eclipse.papyrus.infra.gmfdiag.common lazy
+ org.eclipse.papyrus.uml.service.types lazy
+ org.eclipse.papyrus.infra.gmfdiag.css lazy
+ org.eclipse.papyrus.uml.diagram.usecase lazy
+ org.eclipse.papyrus.views.modelexplorer.newchild lazy
+ 
+}
+
+//manualUpdate
+location "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/" Papyrus-Oxygen-Developer {
+ org.eclipse.papyrus.junit.framework lazy
+ org.eclipse.papyrus.junit.utils lazy
+ org.eclipse.papyrus.tests.framework lazy
+ 
+}
+
+location gmfTooling "http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a" {
+ org.eclipse.gmf.codegen lazy
+ 
+} 

refactoring/releng/targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform/pom.xml

diff --git a/refactoring/releng/targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform/pom.xml b/refactoring/releng/targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform/pom.xml
new file mode 100755
index 0000000..00c9998
--- /dev/null
+++ b/refactoring/releng/targetplatform/org.eclipse.papyrus.incubation.refactoring.targetplatform/pom.xml
@@ -0,0 +1,14 @@
+<?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.incubation.refactoring</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.refactoring.releng.targetplatform</artifactId>		
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>	
+	
+	<artifactId>org.eclipse.papyrus.incubation.refactoring.targetplatform</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	
+</project>
\ No newline at end of file

refactoring/releng/targetplatform/pom.xml

diff --git a/refactoring/releng/targetplatform/pom.xml b/refactoring/releng/targetplatform/pom.xml
new file mode 100755
index 0000000..3c84187
--- /dev/null
+++ b/refactoring/releng/targetplatform/pom.xml
@@ -0,0 +1,18 @@
+<?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.incubation.refactoring</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.refactoring.releng</artifactId>		
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.refactoring.releng.targetplatform</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.incubation.refactoring.targetplatform</module>
+	</modules>
+	
+</project>
\ No newline at end of file

refactoring/tests/org.eclipse.papyrus.refactoring.tests/.classpath

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/.classpath b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/.classpath
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/.classpath
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/.classpath

refactoring/tests/org.eclipse.papyrus.refactoring.tests/.project

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/.project b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/.project
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/.project
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/.project

refactoring/tests/org.eclipse.papyrus.refactoring.tests/.settings/org.eclipse.jdt.core.prefs

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/.settings/org.eclipse.jdt.core.prefs b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/.settings/org.eclipse.jdt.core.prefs
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/.settings/org.eclipse.jdt.core.prefs

refactoring/tests/org.eclipse.papyrus.refactoring.tests/META-INF/MANIFEST.MF

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/META-INF/MANIFEST.MF b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/META-INF/MANIFEST.MF
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/META-INF/MANIFEST.MF

refactoring/tests/org.eclipse.papyrus.refactoring.tests/about.html

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/about.html b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/about.html
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/about.html
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/about.html

refactoring/tests/org.eclipse.papyrus.refactoring.tests/build.properties

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/build.properties b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/build.properties
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/build.properties
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/build.properties

refactoring/tests/org.eclipse.papyrus.refactoring.tests/org.eclipse.papyrus.refactoring.tests.launch

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/org.eclipse.papyrus.refactoring.tests.launch b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/org.eclipse.papyrus.refactoring.tests.launch
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/org.eclipse.papyrus.refactoring.tests.launch
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/org.eclipse.papyrus.refactoring.tests.launch

refactoring/tests/org.eclipse.papyrus.refactoring.tests/plugin.properties

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/plugin.properties b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/plugin.properties
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/plugin.properties
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/plugin.properties

refactoring/tests/org.eclipse.papyrus.refactoring.tests/pom.xml

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/pom.xml b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/pom.xml
similarity index 76%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/pom.xml
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/pom.xml
index 8474865..8d5c445 100755
--- a/refactoring/org.eclipse.papyrus.refactoring.tests/pom.xml
+++ b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/pom.xml
@@ -3,11 +3,14 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.eclipse.papyrus.refactoring.tests</artifactId>
-	<packaging>eclipse-test-plugin</packaging>
+	
 	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.refactoring.parent</artifactId>
+		<groupId>org.eclipse.papyrus.incubation.refactoring</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.refactoring.tests</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
+
+	<artifactId>org.eclipse.papyrus.refactoring.tests</artifactId>
+	<packaging>eclipse-test-plugin</packaging>
+
 </project>

refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/mainPModel1.di

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/resources/mainPModel1.di b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/mainPModel1.di
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/resources/mainPModel1.di
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/mainPModel1.di

refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/mainPModel1.notation

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/resources/mainPModel1.notation b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/mainPModel1.notation
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/resources/mainPModel1.notation
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/mainPModel1.notation

refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/mainPModel1.uml

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/resources/mainPModel1.uml b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/mainPModel1.uml
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/resources/mainPModel1.uml
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/mainPModel1.uml

refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/mainPModel2.di

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/resources/mainPModel2.di b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/mainPModel2.di
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/resources/mainPModel2.di
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/mainPModel2.di

refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/mainPModel2.notation

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/resources/mainPModel2.notation b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/mainPModel2.notation
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/resources/mainPModel2.notation
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/mainPModel2.notation

refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/mainPModel2.uml

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/resources/mainPModel2.uml b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/mainPModel2.uml
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/resources/mainPModel2.uml
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/mainPModel2.uml

refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/refactoringProfile.profile.di

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/resources/refactoringProfile.profile.di b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/refactoringProfile.profile.di
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/resources/refactoringProfile.profile.di
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/refactoringProfile.profile.di

refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/refactoringProfile.profile.notation

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/resources/refactoringProfile.profile.notation b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/refactoringProfile.profile.notation
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/resources/refactoringProfile.profile.notation
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/refactoringProfile.profile.notation

refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/refactoringProfile.profile.uml

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/resources/refactoringProfile.profile.uml b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/refactoringProfile.profile.uml
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/resources/refactoringProfile.profile.uml
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/refactoringProfile.profile.uml

refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/secondaryPModel1.di

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/resources/secondaryPModel1.di b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/secondaryPModel1.di
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/resources/secondaryPModel1.di
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/secondaryPModel1.di

refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/secondaryPModel1.notation

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/resources/secondaryPModel1.notation b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/secondaryPModel1.notation
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/resources/secondaryPModel1.notation
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/secondaryPModel1.notation

refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/secondaryPModel1.uml

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/resources/secondaryPModel1.uml b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/secondaryPModel1.uml
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/resources/secondaryPModel1.uml
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/resources/secondaryPModel1.uml

refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/Activator.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/Activator.java b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/Activator.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/Activator.java
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/Activator.java

refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/AllTests.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/AllTests.java b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/AllTests.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/AllTests.java
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/AllTests.java

refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/messages/Messages.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/messages/Messages.java b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/messages/Messages.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/messages/Messages.java
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/messages/Messages.java

refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/messages/messages.properties

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/messages/messages.properties b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/messages/messages.properties
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/messages/messages.properties
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/messages/messages.properties

refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/mutate/RefactoringMutationTest.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/mutate/RefactoringMutationTest.java b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/mutate/RefactoringMutationTest.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/mutate/RefactoringMutationTest.java
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/mutate/RefactoringMutationTest.java

refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/utils/AbstractPapyrusRefactoringTestCase.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/utils/AbstractPapyrusRefactoringTestCase.java b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/utils/AbstractPapyrusRefactoringTestCase.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/utils/AbstractPapyrusRefactoringTestCase.java
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/utils/AbstractPapyrusRefactoringTestCase.java

refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/utils/ITestConstants.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/utils/ITestConstants.java b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/utils/ITestConstants.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/utils/ITestConstants.java
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/utils/ITestConstants.java

refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/utils/PapyrusRefactoringTestsUtils.java

diff --git a/refactoring/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/utils/PapyrusRefactoringTestsUtils.java b/refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/utils/PapyrusRefactoringTestsUtils.java
similarity index 100%
rename from refactoring/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/utils/PapyrusRefactoringTestsUtils.java
rename to refactoring/tests/org.eclipse.papyrus.refactoring.tests/src/org/eclipse/papyrus/refactoring/tests/utils/PapyrusRefactoringTestsUtils.java

refactoring/tests/pom.xml

diff --git a/refactoring/tests/pom.xml b/refactoring/tests/pom.xml
new file mode 100755
index 0000000..7da743a
--- /dev/null
+++ b/refactoring/tests/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.incubation.refactoring</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.refactoring.parent</artifactId>	
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.refactoring.tests</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.refactoring.tests</module>
+	</modules>	
+	
+</project>
\ No newline at end of file

releng/org.eclipse.papyrus.incubation.p2/pom.xml

diff --git a/releng/org.eclipse.papyrus.incubation.p2/pom.xml b/releng/org.eclipse.papyrus.incubation.p2/pom.xml
index 4e15d13..fe5c307 100755
--- a/releng/org.eclipse.papyrus.incubation.p2/pom.xml
+++ b/releng/org.eclipse.papyrus.incubation.p2/pom.xml
@@ -3,9 +3,9 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>		
-		<version>3.0.0-SNAPSHOT</version>
+		<groupId>org.eclipse.papyrus.incubation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.releng</artifactId>		
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<artifactId>org.eclipse.papyrus.incubation.p2</artifactId>

releng/pom.xml

diff --git a/releng/pom.xml b/releng/pom.xml
index cf661ad..15c9f85 100755
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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</groupId>
-		<artifactId>org.eclipse.papyrus.incubation</artifactId>		
-		<version>3.0.0-SNAPSHOT</version>
+		<groupId>org.eclipse.papyrus.incubation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.all</artifactId>		
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
-	
-	<artifactId>org.eclipse.papyrus.releng</artifactId>
+
+	<artifactId>org.eclipse.papyrus.incubation.releng</artifactId>
 	<packaging>pom</packaging>
 	
 	<modules>

releng/targetplatform/org.eclipse.papyrus.incubation.targetplatform.oxygen/org.eclipse.papyrus.incubation.targetplatform.oxygen.tpd

diff --git a/releng/targetplatform/org.eclipse.papyrus.incubation.targetplatform.oxygen/org.eclipse.papyrus.incubation.targetplatform.oxygen.tpd b/releng/targetplatform/org.eclipse.papyrus.incubation.targetplatform.oxygen/org.eclipse.papyrus.incubation.targetplatform.oxygen.tpd
index 8979b56..0d890c2 100755
--- a/releng/targetplatform/org.eclipse.papyrus.incubation.targetplatform.oxygen/org.eclipse.papyrus.incubation.targetplatform.oxygen.tpd
+++ b/releng/targetplatform/org.eclipse.papyrus.incubation.targetplatform.oxygen/org.eclipse.papyrus.incubation.targetplatform.oxygen.tpd
@@ -1,4 +1,4 @@
-target "Papyrus Oxygen" with source requirements
+target "Papyrus Incubation - Oxygen" with source requirements
 
 location "http://download.eclipse.org/releases/oxygen/" eclipse-oxygen {
  org.eclipse.draw2d.feature.group lazy

releng/targetplatform/org.eclipse.papyrus.incubation.targetplatform.oxygen/pom.xml

diff --git a/releng/targetplatform/org.eclipse.papyrus.incubation.targetplatform.oxygen/pom.xml b/releng/targetplatform/org.eclipse.papyrus.incubation.targetplatform.oxygen/pom.xml
index ee0bcc8..dff70ef 100755
--- a/releng/targetplatform/org.eclipse.papyrus.incubation.targetplatform.oxygen/pom.xml
+++ b/releng/targetplatform/org.eclipse.papyrus.incubation.targetplatform.oxygen/pom.xml
@@ -1,10 +1,11 @@
 <?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</groupId>
-		<artifactId>org.eclipse.papyrus.releng.targetplatform</artifactId>		
-		<version>3.0.0-SNAPSHOT</version>
+		<groupId>org.eclipse.papyrus.incubation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.releng.targetplatform</artifactId>		
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>	
 	
 	<artifactId>org.eclipse.papyrus.incubation.targetplatform.oxygen</artifactId>

releng/targetplatform/pom.xml

diff --git a/releng/targetplatform/pom.xml b/releng/targetplatform/pom.xml
index fd427a7..7884fde 100755
--- a/releng/targetplatform/pom.xml
+++ b/releng/targetplatform/pom.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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</groupId>
-		<artifactId>org.eclipse.papyrus.releng</artifactId>		
-		<version>3.0.0-SNAPSHOT</version>
+		<groupId>org.eclipse.papyrus.incubation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.releng</artifactId>		
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	
-	<artifactId>org.eclipse.papyrus.releng.targetplatform</artifactId>
+	<artifactId>org.eclipse.papyrus.incubation.releng.targetplatform</artifactId>
 	<packaging>pom</packaging>
 	
 	<profiles>

uml.export/features/org.eclipse.papyrus.uml.export.feature/.project

diff --git a/umlexport/org.eclipse.papyrus.uml.export.feature/.project b/uml.export/features/org.eclipse.papyrus.uml.export.feature/.project
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export.feature/.project
rename to uml.export/features/org.eclipse.papyrus.uml.export.feature/.project

uml.export/features/org.eclipse.papyrus.uml.export.feature/build.properties

diff --git a/umlexport/org.eclipse.papyrus.uml.export.feature/build.properties b/uml.export/features/org.eclipse.papyrus.uml.export.feature/build.properties
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export.feature/build.properties
rename to uml.export/features/org.eclipse.papyrus.uml.export.feature/build.properties

uml.export/features/org.eclipse.papyrus.uml.export.feature/epl-v10.html

diff --git a/umlexport/org.eclipse.papyrus.uml.export.feature/epl-v10.html b/uml.export/features/org.eclipse.papyrus.uml.export.feature/epl-v10.html
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export.feature/epl-v10.html
rename to uml.export/features/org.eclipse.papyrus.uml.export.feature/epl-v10.html

uml.export/features/org.eclipse.papyrus.uml.export.feature/feature.properties

diff --git a/umlexport/org.eclipse.papyrus.uml.export.feature/feature.properties b/uml.export/features/org.eclipse.papyrus.uml.export.feature/feature.properties
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export.feature/feature.properties
rename to uml.export/features/org.eclipse.papyrus.uml.export.feature/feature.properties

uml.export/features/org.eclipse.papyrus.uml.export.feature/feature.xml

diff --git a/umlexport/org.eclipse.papyrus.uml.export.feature/feature.xml b/uml.export/features/org.eclipse.papyrus.uml.export.feature/feature.xml
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export.feature/feature.xml
rename to uml.export/features/org.eclipse.papyrus.uml.export.feature/feature.xml

uml.export/features/org.eclipse.papyrus.uml.export.feature/license.html

diff --git a/umlexport/org.eclipse.papyrus.uml.export.feature/license.html b/uml.export/features/org.eclipse.papyrus.uml.export.feature/license.html
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export.feature/license.html
rename to uml.export/features/org.eclipse.papyrus.uml.export.feature/license.html

uml.export/features/org.eclipse.papyrus.uml.export.feature/pom.xml

diff --git a/uml.export/features/org.eclipse.papyrus.uml.export.feature/pom.xml b/uml.export/features/org.eclipse.papyrus.uml.export.feature/pom.xml
new file mode 100755
index 0000000..b486ef0
--- /dev/null
+++ b/uml.export/features/org.eclipse.papyrus.uml.export.feature/pom.xml
@@ -0,0 +1,14 @@
+<?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.incubation.uml.export</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.uml.export.features</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.uml.export.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file

uml.export/features/pom.xml

diff --git a/uml.export/features/pom.xml b/uml.export/features/pom.xml
new file mode 100755
index 0000000..9d0493d
--- /dev/null
+++ b/uml.export/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.incubation.uml.export</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.uml.export.parent</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.uml.export.features</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.uml.export.feature</module>
+	</modules>	
+	
+</project>
\ No newline at end of file

uml.export/plugins/org.eclipse.papyrus.uml.export/.classpath

diff --git a/umlexport/org.eclipse.papyrus.uml.export/.classpath b/uml.export/plugins/org.eclipse.papyrus.uml.export/.classpath
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/.classpath
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/.classpath

uml.export/plugins/org.eclipse.papyrus.uml.export/.project

diff --git a/umlexport/org.eclipse.papyrus.uml.export/.project b/uml.export/plugins/org.eclipse.papyrus.uml.export/.project
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/.project
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/.project

uml.export/plugins/org.eclipse.papyrus.uml.export/.settings/org.eclipse.jdt.core.prefs

diff --git a/umlexport/org.eclipse.papyrus.uml.export/.settings/org.eclipse.jdt.core.prefs b/uml.export/plugins/org.eclipse.papyrus.uml.export/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/.settings/org.eclipse.jdt.core.prefs
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/.settings/org.eclipse.jdt.core.prefs

uml.export/plugins/org.eclipse.papyrus.uml.export/.settings/org.eclipse.jdt.ui.prefs

diff --git a/umlexport/org.eclipse.papyrus.uml.export/.settings/org.eclipse.jdt.ui.prefs b/uml.export/plugins/org.eclipse.papyrus.uml.export/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/.settings/org.eclipse.jdt.ui.prefs
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/.settings/org.eclipse.jdt.ui.prefs

uml.export/plugins/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF

diff --git a/umlexport/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF b/uml.export/plugins/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF

uml.export/plugins/org.eclipse.papyrus.uml.export/about.html

diff --git a/umlexport/org.eclipse.papyrus.uml.export/about.html b/uml.export/plugins/org.eclipse.papyrus.uml.export/about.html
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/about.html
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/about.html

uml.export/plugins/org.eclipse.papyrus.uml.export/build.properties

diff --git a/umlexport/org.eclipse.papyrus.uml.export/build.properties b/uml.export/plugins/org.eclipse.papyrus.uml.export/build.properties
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/build.properties
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/build.properties

uml.export/plugins/org.eclipse.papyrus.uml.export/icons/export_wiz_16x16-papyrusColor.gif

diff --git a/umlexport/org.eclipse.papyrus.uml.export/icons/export_wiz_16x16-papyrusColor.gif b/uml.export/plugins/org.eclipse.papyrus.uml.export/icons/export_wiz_16x16-papyrusColor.gif
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/icons/export_wiz_16x16-papyrusColor.gif
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/icons/export_wiz_16x16-papyrusColor.gif
Binary files differ

uml.export/plugins/org.eclipse.papyrus.uml.export/icons/import_wiz_16x16-papyrusColor.gif

diff --git a/umlexport/org.eclipse.papyrus.uml.export/icons/import_wiz_16x16-papyrusColor.gif b/uml.export/plugins/org.eclipse.papyrus.uml.export/icons/import_wiz_16x16-papyrusColor.gif
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/icons/import_wiz_16x16-papyrusColor.gif
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/icons/import_wiz_16x16-papyrusColor.gif
Binary files differ

uml.export/plugins/org.eclipse.papyrus.uml.export/plugin.properties

diff --git a/umlexport/org.eclipse.papyrus.uml.export/plugin.properties b/uml.export/plugins/org.eclipse.papyrus.uml.export/plugin.properties
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/plugin.properties
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/plugin.properties

uml.export/plugins/org.eclipse.papyrus.uml.export/plugin.xml

diff --git a/umlexport/org.eclipse.papyrus.uml.export/plugin.xml b/uml.export/plugins/org.eclipse.papyrus.uml.export/plugin.xml
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/plugin.xml
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/plugin.xml

uml.export/plugins/org.eclipse.papyrus.uml.export/pom.xml

diff --git a/uml.export/plugins/org.eclipse.papyrus.uml.export/pom.xml b/uml.export/plugins/org.eclipse.papyrus.uml.export/pom.xml
new file mode 100755
index 0000000..ef2d0ec
--- /dev/null
+++ b/uml.export/plugins/org.eclipse.papyrus.uml.export/pom.xml
@@ -0,0 +1,14 @@
+<?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.incubation.uml.export</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.uml.export.plugins</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.uml.export</artifactId>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file

uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/Activator.java

diff --git a/umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/Activator.java b/uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/Activator.java
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/Activator.java
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/Activator.java

uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/dialog/ExportProfilesIconsDialog.java

diff --git a/umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/dialog/ExportProfilesIconsDialog.java b/uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/dialog/ExportProfilesIconsDialog.java
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/dialog/ExportProfilesIconsDialog.java
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/dialog/ExportProfilesIconsDialog.java

uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/dialog/ExportProfilesParametersDialog.java

diff --git a/umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/dialog/ExportProfilesParametersDialog.java b/uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/dialog/ExportProfilesParametersDialog.java
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/dialog/ExportProfilesParametersDialog.java
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/dialog/ExportProfilesParametersDialog.java

uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/dialog/ProfilesToExportSelectionDialog.java

diff --git a/umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/dialog/ProfilesToExportSelectionDialog.java b/uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/dialog/ProfilesToExportSelectionDialog.java
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/dialog/ProfilesToExportSelectionDialog.java
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/dialog/ProfilesToExportSelectionDialog.java

uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/handlers/EditProfileApplicationAction.java

diff --git a/umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/handlers/EditProfileApplicationAction.java b/uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/handlers/EditProfileApplicationAction.java
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/handlers/EditProfileApplicationAction.java
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/handlers/EditProfileApplicationAction.java

uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/handlers/ExportAppliedProfileHandler.java

diff --git a/umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/handlers/ExportAppliedProfileHandler.java b/uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/handlers/ExportAppliedProfileHandler.java
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/handlers/ExportAppliedProfileHandler.java
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/handlers/ExportAppliedProfileHandler.java

uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/handlers/ExportProfilesCommand.java

diff --git a/umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/handlers/ExportProfilesCommand.java b/uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/handlers/ExportProfilesCommand.java
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/handlers/ExportProfilesCommand.java
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/handlers/ExportProfilesCommand.java

uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/messages/Messages.java

diff --git a/umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/messages/Messages.java b/uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/messages/Messages.java
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/messages/Messages.java
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/messages/Messages.java

uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/messages/messages.properties

diff --git a/umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/messages/messages.properties b/uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/messages/messages.properties
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/messages/messages.properties
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/messages/messages.properties

uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/AreThereAppliedProfilesFromWS.java

diff --git a/umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/AreThereAppliedProfilesFromWS.java b/uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/AreThereAppliedProfilesFromWS.java
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/AreThereAppliedProfilesFromWS.java
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/AreThereAppliedProfilesFromWS.java

uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/BuildProperties.java

diff --git a/umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/BuildProperties.java b/uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/BuildProperties.java
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/BuildProperties.java
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/BuildProperties.java

uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ChangeProfileApplicationTester.java

diff --git a/umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ChangeProfileApplicationTester.java b/uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ChangeProfileApplicationTester.java
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ChangeProfileApplicationTester.java
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ChangeProfileApplicationTester.java

uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ExportProfilesUserParameters.java

diff --git a/umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ExportProfilesUserParameters.java b/uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ExportProfilesUserParameters.java
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ExportProfilesUserParameters.java
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ExportProfilesUserParameters.java

uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ImportedLibrary.java

diff --git a/umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ImportedLibrary.java b/uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ImportedLibrary.java
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ImportedLibrary.java
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ImportedLibrary.java

uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/InstalledProfileURI.java

diff --git a/umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/InstalledProfileURI.java b/uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/InstalledProfileURI.java
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/InstalledProfileURI.java
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/InstalledProfileURI.java

uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/PluginExportUtil.java

diff --git a/umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/PluginExportUtil.java b/uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/PluginExportUtil.java
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/PluginExportUtil.java
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/PluginExportUtil.java

uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ProfileUtil.java

diff --git a/umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ProfileUtil.java b/uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ProfileUtil.java
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ProfileUtil.java
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ProfileUtil.java

uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ProfilesLabelProvider.java

diff --git a/umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ProfilesLabelProvider.java b/uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ProfilesLabelProvider.java
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ProfilesLabelProvider.java
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/ProfilesLabelProvider.java

uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/WSFileUtil.java

diff --git a/umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/WSFileUtil.java b/uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/WSFileUtil.java
similarity index 100%
rename from umlexport/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/WSFileUtil.java
rename to uml.export/plugins/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/util/WSFileUtil.java

uml.export/plugins/pom.xml

diff --git a/uml.export/plugins/pom.xml b/uml.export/plugins/pom.xml
new file mode 100755
index 0000000..8073b4d
--- /dev/null
+++ b/uml.export/plugins/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.incubation.uml.export</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.uml.export.parent</artifactId>	
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.uml.export.plugins</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.uml.export</module>
+	</modules>	
+	
+</project>
\ No newline at end of file

uml.export/pom.xml

diff --git a/uml.export/pom.xml b/uml.export/pom.xml
new file mode 100755
index 0000000..b3163ad
--- /dev/null
+++ b/uml.export/pom.xml
@@ -0,0 +1,38 @@
+<?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.incubation</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.all</artifactId>		
+		<version>3.1.0-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.eclipse.papyrus.incubation.uml.export</groupId>
+	<artifactId>org.eclipse.papyrus.incubation.uml.export.parent</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>features</module>
+		<module>plugins</module>
+	</modules>	
+				
+	<profiles>
+		<profile>
+	      <id>uml.export</id>	
+	     
+		  <properties>
+			<targetplatform.groupId>org.eclipse.papyrus.incubation.uml.export</targetplatform.groupId>
+			<targetplatform.artifactId>org.eclipse.papyrus.incubation.uml.export.targetplatform</targetplatform.artifactId>
+			<targetplatform.version>1.2.0-SNAPSHOT</targetplatform.version>
+		  </properties>
+	            
+	      <modules>
+	      	<module>releng</module>
+	      </modules>
+	    </profile>
+	</profiles>
+	
+</project>
\ No newline at end of file

uml.export/releng/org.eclipse.papyrus.incubation.uml.export.p2/.project

diff --git a/uml.export/releng/org.eclipse.papyrus.incubation.uml.export.p2/.project b/uml.export/releng/org.eclipse.papyrus.incubation.uml.export.p2/.project
new file mode 100755
index 0000000..0a79233
--- /dev/null
+++ b/uml.export/releng/org.eclipse.papyrus.incubation.uml.export.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>

uml.export/releng/org.eclipse.papyrus.incubation.uml.export.p2/category.xml

diff --git a/uml.export/releng/org.eclipse.papyrus.incubation.uml.export.p2/category.xml b/uml.export/releng/org.eclipse.papyrus.incubation.uml.export.p2/category.xml
new file mode 100755
index 0000000..259f9a7
--- /dev/null
+++ b/uml.export/releng/org.eclipse.papyrus.incubation.uml.export.p2/category.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+  <feature url="features/org.eclipse.papyrus.uml.export.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.uml.export.feature" version="1.2.0.qualifier">
+      <category name="org.eclipse.papyrus.incubation.category"/>
+   </feature>
+   <feature url="features/org.eclipse.papyrus.uml.export.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.uml.export.feature.source" version="1.2.0.qualifier">
+      <category name="org.eclipse.papyrus.incubation.category"/>
+   </feature>
+  
+  <category-def name="org.eclipse.papyrus.incubation.category" label="Papyrus Incubation">
+      <description>
+         Papyrus Incubation features
+      </description>
+   </category-def>
+</site>

uml.export/releng/org.eclipse.papyrus.incubation.uml.export.p2/pom.xml

diff --git a/uml.export/releng/org.eclipse.papyrus.incubation.uml.export.p2/pom.xml b/uml.export/releng/org.eclipse.papyrus.incubation.uml.export.p2/pom.xml
new file mode 100755
index 0000000..c25a658
--- /dev/null
+++ b/uml.export/releng/org.eclipse.papyrus.incubation.uml.export.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.incubation.uml.export</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.uml.export.releng</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.uml.export.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

uml.export/releng/pom.xml

diff --git a/uml.export/releng/pom.xml b/uml.export/releng/pom.xml
new file mode 100755
index 0000000..0072da3
--- /dev/null
+++ b/uml.export/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.incubation.uml.export</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.uml.export.parent</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.uml.export.releng</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>targetplatform</module>
+		<module>org.eclipse.papyrus.incubation.uml.export.p2</module>
+	</modules>	
+	
+</project>
\ No newline at end of file

uml.export/releng/promote/dsmlvalidation.sh

diff --git a/uml.export/releng/promote/dsmlvalidation.sh b/uml.export/releng/promote/dsmlvalidation.sh
new file mode 100755
index 0000000..a687dda
--- /dev/null
+++ b/uml.export/releng/promote/dsmlvalidation.sh
@@ -0,0 +1,258 @@
+#Based upon Gef4 publish.sh script
+
+#causes the shell to exit if any subcommand or pipeline returns a non-zero status.
+#set -e
+
+# Script may take 5-6 command line parameters:
+# $1: Hudson job name: <name>
+# $2: Hudson build id: <id>
+# $3: Build type: i(ntegration), s(table), r(elease)
+# $4: The release label used to label the drop files, e.g. 3.10.0 or 3.10.1
+# $5: The eclipse target version, e.g. mars or neon
+# $6: Override if exists
+# $7: An optional release label suffix to be appended to drop files name, e.g. M1, RC1 
+
+##Additional variables to specify for each project
+
+#The root url that enables to find the job with ${hudsonJobRootUrl}/$jobName/$buildNumber
+hudsonJobRootUrl="https://hudson.eclipse.org/papyrus/job"
+
+#The name of the tool
+repo="incubation"
+subRepo="uml.export"
+updates="updates"
+drops="downloads/drops"
+
+#The specific localization
+remoteRoot="/home/data/httpd/download.eclipse.org"
+papyrusRoot="modeling/mdt/papyrus"
+remoteUpdateSiteRoot=${remoteRoot}/${papyrusRoot}/${repo}
+remoteUpdateSite=${remoteUpdateSiteRoot}/${subRepo}
+remoteUpdateSiteDir=${remoteUpdateSite}/${updates}
+echo "remoteUpdateSiteDir: $remoteUpdateSiteDir"
+
+#The localization of the local build target
+targetResults="archive/${subRepo}/releng/org.eclipse.papyrus.${repo}.${subRepo}.p2/target/repository"
+echo "targetResults: $targetResults"
+
+#The rcpPrompote.sh script may be used to publish the Incubation build results. 
+#if [ $# -eq 6 -o $# -eq 7  ];
+#then
+#	jobName=$1
+jobName="Papyrus-Incubation-DsmlValidation"
+	echo "jobName: $jobName"
+#	buildNumber=$2
+buildNumber="4"
+	echo "buildNumber: $buildNumber"
+#	releaseType=$3
+releaseType="i"
+	echo "releaseType: $releaseType"
+#	releaseLabel=$4	
+releaseLabel="1.2.0"
+	echo "releaseLabel: $releaseLabel"
+#	eclipseTarget=$5
+eclipseTarget="oxygen"	
+	echo "eclipseTarget: $eclipseTarget"
+#	override=$6	
+override="y"
+	echo "override: $override"
+
+	if [ -n "$7" ];
+	then
+		releaseLabelSuffix=$7
+		echo "releaseLabelSuffix: $releaseLabelSuffix"
+	fi
+#else
+#	echo "Missing so parameters: command jobName buildNumber releaseType releaseLabel eclipseTarget override [releaseLabelSuffix]"
+#	exit 1;
+#fi
+
+###########jobName parameter###########
+if [ -z "$jobName" ];
+then
+	echo "The Hudson job you want to promote must be specified"
+	exit 1
+fi
+
+###########buildNumber parameter###########
+if [ -z "$buildNumber" ];
+then
+	echo "The id of the $jobName build you want to promote must be specified"
+	exit 1
+fi
+
+###########releaseType parameter###########
+if [ -z "$releaseType" ];
+then
+    echo "The type of build you want to publish to [i(integration), s(table), r(elease)]."
+    exit;
+fi
+echo "Publishing as $releaseType build"
+
+###########releaseLabel parameter###########
+if [ -z "$releaseLabel" ];
+then
+    echo "The release label (e.g. 3.10.0, 3.10.1M2) must be specified."
+    exit 1
+fi
+echo "Release label: $releaseLabel"
+
+###########eclipseTarget parameter###########
+if [ -z "$eclipseTarget" ];
+then
+    echo "The Eclipse target (e.g. mars, neon) must be specified."
+    exit 1
+fi
+echo "Eclipse target : $eclipseTarget"
+
+###########Override parameter###########
+if [ "$override" != y -a "$override" != n ];
+then
+	echo "Parameter override has to 'y'(es) or 'n'(o) but was: $override"
+    exit 0
+fi
+
+if [ "$override" == "y" ];
+then
+	echo "Will override the previous artifacts if found"
+else
+	echo "Will not override the previous arifacts if found"
+fi
+
+########### Compute local build results using buildNumber ###########
+if [ "$buildNumber" = "lastStable" -o "$buildNumber" = "lastSuccessful" ];
+then
+	# Reverse lookup the build id (in case lastSuccessful or lastStable was used)
+	for i in $(find ~/.hudson/jobs/$jobName/builds/ -type l)
+	do
+		if [ "$(readlink -f $i)" = "$(readlink -f ~/.hudson/jobs/$jobName/$buildNumber)" ];
+		then
+			buildNumber=${i##*/}
+		fi
+	done
+	echo "Reverse lookup (lastStable/lastSuccessful) yielded buildNumber: $buildNumber"
+fi
+
+echo "~/.hudson/jobs/${jobName}/builds/${buildNumber}"
+jobDir=$(readlink -f ~/.hudson/jobs/${jobName}/builds/${buildNumber})
+if ! [ -d $jobDir ];
+then
+	echo "The specified buildNumber does not refer to an existing build: $buildNumber"
+	exit 1
+fi
+
+localResults=${jobDir}/${targetResults}
+echo "localResults: ${localResults}"
+
+########### Promote Job ###########
+destination=$remoteUpdateSiteDir/$eclipseTarget/${releaseLabel}${releaseLabelSuffix}
+echo "Destination: $destination"
+
+if [ "$override" == "n" ];
+then
+	if [ -d $destination ];
+	then
+		if [ "$(ls -A ${destination})" ];
+		then
+			echo "The destination is not empty. You may consider overriding or archiving"
+			exit 1
+		fi
+	fi
+fi
+
+if [ "$override" == "y" ];
+then
+	if [ -d $destination ];
+	then
+		echo "Overriding the RCP by cleaning the $destination folder"
+		rm -rf ${destination}/*
+	fi
+fi
+
+#Go to the artifact directory
+cd $localResults
+echo "Promoting the Job to $destination"
+#No error if exists, makes parent directories as needed
+mkdir -p $destination
+
+#Copy the contents onto the temp folder and change the permissions
+cp -R * $destination
+
+
+########### Update composites ###########
+# TODO update composite root ./eclipseTarget/* and parent ./*
+echo "Update Composites"
+timestamp=$(date +%s000)
+
+# This function indents the text with two white spaces
+indent() {
+sed 's/^/  /';
+}
+
+# This function is used to generate the composites
+function updateComposites() {
+cat > "compositeArtifacts.xml" <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<repository name="Papyrus" type="org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository" version="1.0.0">
+  <properties size="1">
+    <property name="p2.timestamp" value="$1"/>
+  </properties>
+  <children size="$2">
+$(	
+for file in *; do 
+if [ -d $file ]; then 
+    printf "<child location='${file}'/>" | indent | indent
+fi
+done
+)
+  </children>
+</repository>
+EOF
+
+cat > "compositeContent.xml" <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<repository name="Papyrus" type="org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" version="1.0.0">
+  <properties size="1">
+    <property name="p2.timestamp" value="$1"/>
+  </properties>
+  <children size="$2">
+$(	
+for file in *; do 
+if [ -d $file ]; then 
+    printf "<child location='${file}'/>" | indent | indent
+fi
+done
+)
+  </children>
+</repository>
+EOF
+}
+
+echo "Update root composites: $remoteUpdateSite"
+cd $remoteUpdateSite
+childrenCount=$(find . -maxdepth 1 -type d  \( ! -iname ".*" \) | wc -l)
+updateComposites $timestamp $childrenCount
+
+echo "Update eclipseTarget composites: $remoteUpdateSiteDir"
+cd $remoteUpdateSiteDir
+childrenCount=$(find . -maxdepth 1 -type d  \( ! -iname ".*" \) | wc -l)
+updateComposites $timestamp $childrenCount
+
+echo "Update releaseLabel composites: $remoteUpdateSiteDir/$eclipseTarget"
+cd $remoteUpdateSiteDir/$eclipseTarget
+childrenCount=$(find . -maxdepth 1 -type d  \( ! -iname ".*" \) | wc -l)
+updateComposites $timestamp $childrenCount
+
+
+########### Set Access Rights ###########
+
+# This function sets the acess rights to allow all memebers of the group to edit the files
+function setAccessRights() {
+	chmod -R 775 "$1"
+	chgrp -hR modeling.mdt.papyrus "$1"
+}
+echo "Set access right -R: $remoteUpdateSiteDir"
+setAccessRights $remoteUpdateSiteDir
+
+
+echo "publishing done."
\ No newline at end of file

uml.export/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.uml.export.targetplatform.target

diff --git a/uml.export/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.uml.export.targetplatform.target b/uml.export/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.uml.export.targetplatform.target
new file mode 100755
index 0000000..95fe8ba
--- /dev/null
+++ b/uml.export/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.uml.export.targetplatform.target
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="UML export - Oxygen" sequenceNumber="1504259019">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.uml2.uml" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.common.edit" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.editor" version="0.0.0"/>
+      <repository location="file:/home/data/httpd/download.eclipse.org/releases/oxygen/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.views.modelexplorer" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.extensionpoints" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.eclipse.project.editors" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.tools" version="0.0.0"/>
+      <repository id="Papyrus-Nightly-Oxygen" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+  </locations>
+</target>

uml.export/releng/targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform/.project

diff --git a/uml.export/releng/targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform/.project b/uml.export/releng/targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform/.project
new file mode 100755
index 0000000..7477ea0
--- /dev/null
+++ b/uml.export/releng/targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.incubation.targetplatform.oxygen</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

uml.export/releng/targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform.target

diff --git a/uml.export/releng/targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform.target b/uml.export/releng/targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform.target
new file mode 100755
index 0000000..6430c9b
--- /dev/null
+++ b/uml.export/releng/targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform.target
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="UML export - Oxygen" sequenceNumber="1504259019">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.uml2.uml" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.common.edit" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.editor" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/releases/oxygen/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.views.modelexplorer" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.extensionpoints" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.eclipse.project.editors" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.uml.tools" version="0.0.0"/>
+      <repository id="Papyrus-Nightly-Oxygen" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+  </locations>
+</target>

uml.export/releng/targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform.tpd

diff --git a/uml.export/releng/targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform.tpd b/uml.export/releng/targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform.tpd
new file mode 100755
index 0000000..3f84ff3
--- /dev/null
+++ b/uml.export/releng/targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform.tpd
@@ -0,0 +1,17 @@
+target "UML export - Oxygen" with source requirements
+
+location "http://download.eclipse.org/releases/oxygen/" {
+ org.eclipse.uml2.uml lazy
+ org.eclipse.uml2.common.edit lazy
+ org.eclipse.papyrus.editor lazy
+ 
+}
+
+
+location "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/" Papyrus-Nightly-Oxygen {
+ org.eclipse.papyrus.views.modelexplorer lazy
+ org.eclipse.papyrus.uml.extensionpoints lazy
+ org.eclipse.papyrus.eclipse.project.editors lazy
+ org.eclipse.papyrus.uml.tools lazy
+ 
+}
\ No newline at end of file

uml.export/releng/targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform/pom.xml

diff --git a/uml.export/releng/targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform/pom.xml b/uml.export/releng/targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform/pom.xml
new file mode 100755
index 0000000..0081e76
--- /dev/null
+++ b/uml.export/releng/targetplatform/org.eclipse.papyrus.incubation.uml.export.targetplatform/pom.xml
@@ -0,0 +1,14 @@
+<?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.incubation.uml.export</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.uml.export.releng.targetplatform</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>	
+	
+	<artifactId>org.eclipse.papyrus.incubation.uml.export.targetplatform</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	
+</project>
\ No newline at end of file

uml.export/releng/targetplatform/pom.xml

diff --git a/uml.export/releng/targetplatform/pom.xml b/uml.export/releng/targetplatform/pom.xml
new file mode 100755
index 0000000..762cf2f
--- /dev/null
+++ b/uml.export/releng/targetplatform/pom.xml
@@ -0,0 +1,18 @@
+<?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.incubation.uml.export</groupId>
+		<artifactId>org.eclipse.papyrus.incubation.uml.export.releng</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.incubation.uml.export.releng.targetplatform</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.incubation.uml.export.targetplatform</module>
+	</modules>
+	
+</project>
\ No newline at end of file

umlexport/org.eclipse.papyrus.uml.export.feature/pom.xml

diff --git a/umlexport/org.eclipse.papyrus.uml.export.feature/pom.xml b/umlexport/org.eclipse.papyrus.uml.export.feature/pom.xml
deleted file mode 100755
index 4478973..0000000
--- a/umlexport/org.eclipse.papyrus.uml.export.feature/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.uml.export.parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.export.feature</artifactId>
-	<packaging>eclipse-feature</packaging>
-</project>
\ No newline at end of file

umlexport/org.eclipse.papyrus.uml.export/pom.xml

diff --git a/umlexport/org.eclipse.papyrus.uml.export/pom.xml b/umlexport/org.eclipse.papyrus.uml.export/pom.xml
deleted file mode 100755
index b78e39e..0000000
--- a/umlexport/org.eclipse.papyrus.uml.export/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.uml.export.parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.export</artifactId>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file

umlexport/pom.xml

diff --git a/umlexport/pom.xml b/umlexport/pom.xml
deleted file mode 100755
index 77c0e53..0000000
--- a/umlexport/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.incubation</artifactId>		
-		<version>3.0.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.export.parent</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	
-	<modules>
-		<module>org.eclipse.papyrus.uml.export</module>
-		<module>org.eclipse.papyrus.uml.export.feature</module>
-	</modules>	
-	
-</project>
\ No newline at end of file