[Releng] Update the repository architecture
- Move all the sub-modules to the root
- Delete the now obsolete root releng configuration
Change-Id: I32352bbc949111c523b606107ac3fa3110e2dd95
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 25b0b76..5de3539 100755
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,4 +3,19 @@
Thanks for your interest in this project.
+__This repository is hosted at [Eclipse] (http://git.eclipse.org/c/papyrus/org.eclipse.papyrus-collaborativemodeling.git/)__
+
+The associated modules can be installed through their Jenkins builds or, when available, their own update sites.
+* Compare
+ * [Nightly] (http://download.eclipse.org/modeling/mdt/papyrus/components/compare/updates/nightly)
+ * [Integration] (http://download.eclipse.org/modeling/mdt/papyrus/components/compare/updates/integration)
+
+* CDO
+ * [Nightly] (https://ci.eclipse.org/papyrus/job/Papyrus-CDO/lastSuccessfulBuild/artifact/repository/)
+
+* Revision
+ * [Nightly] (https://ci.eclipse.org/papyrus/job/Papyrus-Revision/lastSuccessfulBuild/artifact/plugins/revision/releng/org.eclipse.papyrus.revisiontool.p2/target/repository/)
+
+If you have any questions, please ask them on the [Forum] (https://www.eclipse.org/forums/index.php/f/121/)
+
diff --git a/README.MD b/README.MD
deleted file mode 100644
index f07923f..0000000
--- a/README.MD
+++ /dev/null
@@ -1,5 +0,0 @@
-# Papyrus Collaborative Modeling #
-This is the collaborative modeling git repository
-
-This repository is hosted at [Eclipse] (http://git.eclipse.org/c/papyrus/org.eclipse.papyrus-collaborativemodeling.git/)
-
diff --git a/plugins/cdo-server/LICENSE b/cdo-server/LICENSE
similarity index 100%
rename from plugins/cdo-server/LICENSE
rename to cdo-server/LICENSE
diff --git a/plugins/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2.product/.project b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2.product/.project
similarity index 100%
rename from plugins/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2.product/.project
rename to cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2.product/.project
diff --git a/plugins/cdo-server/cdo-server-releng/.project b/cdo-server/cdo-server-releng/.project
similarity index 100%
rename from plugins/cdo-server/cdo-server-releng/.project
rename to cdo-server/cdo-server-releng/.project
diff --git a/plugins/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.target b/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.target
similarity index 100%
rename from plugins/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.target
rename to cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.target
diff --git a/plugins/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.tpd b/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.tpd
similarity index 100%
rename from plugins/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.tpd
rename to cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.tpd
diff --git a/plugins/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/pom.xml b/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/pom.xml
similarity index 100%
rename from plugins/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/pom.xml
rename to cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/pom.xml
diff --git a/plugins/cdo-server/cdo-server-releng/main/pom.xml b/cdo-server/cdo-server-releng/main/pom.xml
similarity index 100%
rename from plugins/cdo-server/cdo-server-releng/main/pom.xml
rename to cdo-server/cdo-server-releng/main/pom.xml
diff --git a/plugins/cdo-server/cdo-server-releng/pom.xml b/cdo-server/cdo-server-releng/pom.xml
similarity index 100%
rename from plugins/cdo-server/cdo-server-releng/pom.xml
rename to cdo-server/cdo-server-releng/pom.xml
diff --git a/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.classpath b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.classpath
similarity index 100%
rename from plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.classpath
rename to cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.classpath
diff --git a/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.project b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.project
similarity index 100%
rename from plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.project
rename to cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.project
diff --git a/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.settings/org.eclipse.jdt.core.prefs b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.settings/org.eclipse.jdt.core.prefs
rename to cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/META-INF/MANIFEST.MF b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/META-INF/MANIFEST.MF
rename to cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/META-INF/MANIFEST.MF
diff --git a/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/PapyrusCDOServerH2.product b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/PapyrusCDOServerH2.product
similarity index 100%
rename from plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/PapyrusCDOServerH2.product
rename to cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/PapyrusCDOServerH2.product
diff --git a/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/about.html b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/about.html
similarity index 100%
rename from plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/about.html
rename to cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/about.html
diff --git a/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/build.properties b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/build.properties
similarity index 100%
rename from plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/build.properties
rename to cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/build.properties
diff --git a/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/config/cdo-server.xml b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/config/cdo-server.xml
similarity index 100%
rename from plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/config/cdo-server.xml
rename to cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/config/cdo-server.xml
diff --git a/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/pom.xml b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/pom.xml
similarity index 100%
rename from plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/pom.xml
rename to cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/pom.xml
diff --git a/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/src/org/eclipse/papyrus/cdo/server/h2/product/Activator.java b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/src/org/eclipse/papyrus/cdo/server/h2/product/Activator.java
similarity index 100%
rename from plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/src/org/eclipse/papyrus/cdo/server/h2/product/Activator.java
rename to cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/src/org/eclipse/papyrus/cdo/server/h2/product/Activator.java
diff --git a/plugins/cdo-server/products/pom.xml b/cdo-server/products/pom.xml
similarity index 100%
rename from plugins/cdo-server/products/pom.xml
rename to cdo-server/products/pom.xml
diff --git a/plugins/cdo-server/releng/org.eclipse.papyrus.cdo.server.h2.target.photon/.project b/cdo-server/releng/org.eclipse.papyrus.cdo.server.h2.target.photon/.project
similarity index 100%
rename from plugins/cdo-server/releng/org.eclipse.papyrus.cdo.server.h2.target.photon/.project
rename to cdo-server/releng/org.eclipse.papyrus.cdo.server.h2.target.photon/.project
diff --git a/plugins/cdo/LICENSE b/cdo/LICENSE
similarity index 100%
rename from plugins/cdo/LICENSE
rename to cdo/LICENSE
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/.classpath b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/.classpath
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/.classpath
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/.classpath
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/.project b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/.project
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/.project
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/.project
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/.settings/org.eclipse.jdt.core.prefs b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/.settings/org.eclipse.jdt.core.prefs
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/.settings/org.eclipse.jdt.ui.prefs b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/.settings/org.eclipse.jdt.ui.prefs
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/Benchmarks results.xlsx b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/Benchmarks results.xlsx
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/Benchmarks results.xlsx
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/Benchmarks results.xlsx
Binary files differ
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/META-INF/MANIFEST.MF b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/META-INF/MANIFEST.MF
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/README b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/README
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/README
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/README
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/about.html b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/about.html
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/about.html
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/about.html
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/build.properties b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/build.properties
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/build.properties
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/build.properties
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/pom.xml b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/pom.xml
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/pom.xml
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/pom.xml
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/AbstractModelCreation.java b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/AbstractModelCreation.java
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/AbstractModelCreation.java
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/AbstractModelCreation.java
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/AbstractPerfTest.java b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/AbstractPerfTest.java
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/AbstractPerfTest.java
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/AbstractPerfTest.java
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/AbstractQuickIndexCreationTest.java b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/AbstractQuickIndexCreationTest.java
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/AbstractQuickIndexCreationTest.java
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/AbstractQuickIndexCreationTest.java
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/AbstractUniqueIndexCreationTest.java b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/AbstractUniqueIndexCreationTest.java
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/AbstractUniqueIndexCreationTest.java
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/AbstractUniqueIndexCreationTest.java
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/CDOPapyrusModelCreation.java b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/CDOPapyrusModelCreation.java
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/CDOPapyrusModelCreation.java
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/CDOPapyrusModelCreation.java
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/CDOQuickIndexCreationTest.java b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/CDOQuickIndexCreationTest.java
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/CDOQuickIndexCreationTest.java
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/CDOQuickIndexCreationTest.java
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/CDOUniqueIndexCreationTest.java b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/CDOUniqueIndexCreationTest.java
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/CDOUniqueIndexCreationTest.java
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/CDOUniqueIndexCreationTest.java
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/ExecutionTimeHelper.java b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/ExecutionTimeHelper.java
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/ExecutionTimeHelper.java
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/ExecutionTimeHelper.java
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/ExecutionTimeHelperMerger.java b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/ExecutionTimeHelperMerger.java
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/ExecutionTimeHelperMerger.java
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/ExecutionTimeHelperMerger.java
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/IPapyrusModelCreation.java b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/IPapyrusModelCreation.java
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/IPapyrusModelCreation.java
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/IPapyrusModelCreation.java
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/ModelConstructor.java b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/ModelConstructor.java
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/ModelConstructor.java
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/ModelConstructor.java
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/PapyrusModelCreation.java b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/PapyrusModelCreation.java
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/PapyrusModelCreation.java
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/PapyrusModelCreation.java
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/PurePapyrusQuickIndexCreationTest.java b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/PurePapyrusQuickIndexCreationTest.java
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/PurePapyrusQuickIndexCreationTest.java
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/PurePapyrusQuickIndexCreationTest.java
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/PurePapyrusUniqueIndexCreationTest.java b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/PurePapyrusUniqueIndexCreationTest.java
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/PurePapyrusUniqueIndexCreationTest.java
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/src/org/eclipse/papyrus/cdo/benchmarks/tests/PurePapyrusUniqueIndexCreationTest.java
diff --git a/plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/~$Benchmarks results.xlsx b/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/~$Benchmarks results.xlsx
similarity index 100%
rename from plugins/cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/~$Benchmarks results.xlsx
rename to cdo/benchmarks/org.eclipse.papyrus.cdo.benchmarks/~$Benchmarks results.xlsx
Binary files differ
diff --git a/plugins/cdo/benchmarks/pom.xml b/cdo/benchmarks/pom.xml
similarity index 100%
rename from plugins/cdo/benchmarks/pom.xml
rename to cdo/benchmarks/pom.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/.classpath b/cdo/bundles/org.eclipse.papyrus.cdo.core/.classpath
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/.classpath
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/.classpath
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/.project b/cdo/bundles/org.eclipse.papyrus.cdo.core/.project
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/.project
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/.project
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.core.resources.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.core.resources.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.jdt.core.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.jdt.core.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.jdt.ui.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.jdt.ui.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/about.html b/cdo/bundles/org.eclipse.papyrus.cdo.core/about.html
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/about.html
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/about.html
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/build.properties b/cdo/bundles/org.eclipse.papyrus.cdo.core/build.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/build.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/build.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/model/repositories.ecore b/cdo/bundles/org.eclipse.papyrus.cdo.core/model/repositories.ecore
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/model/repositories.ecore
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/model/repositories.ecore
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/model/repositories.ecorediag b/cdo/bundles/org.eclipse.papyrus.cdo.core/model/repositories.ecorediag
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/model/repositories.ecorediag
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/model/repositories.ecorediag
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/model/repositories.genmodel b/cdo/bundles/org.eclipse.papyrus.cdo.core/model/repositories.genmodel
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/model/repositories.genmodel
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/model/repositories.genmodel
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/plugin.properties b/cdo/bundles/org.eclipse.papyrus.cdo.core/plugin.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/plugin.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/plugin.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/plugin.xml b/cdo/bundles/org.eclipse.papyrus.cdo.core/plugin.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/plugin.xml
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/plugin.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/pom.xml b/cdo/bundles/org.eclipse.papyrus.cdo.core/pom.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/pom.xml
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/pom.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/RepositoriesFactory.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/RepositoriesFactory.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/RepositoriesFactory.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/RepositoriesFactory.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/RepositoriesPackage.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/RepositoriesPackage.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/RepositoriesPackage.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/RepositoriesPackage.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/Repository.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/Repository.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/Repository.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/Repository.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/RepositoryRegistry.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/RepositoryRegistry.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/RepositoryRegistry.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/RepositoryRegistry.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoriesFactoryImpl.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoriesFactoryImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoriesFactoryImpl.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoriesFactoryImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoriesPackageImpl.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoriesPackageImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoriesPackageImpl.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoriesPackageImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoryImpl.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoryImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoryImpl.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoryImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoryRegistryImpl.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoryRegistryImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoryRegistryImpl.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoryRegistryImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesAdapterFactory.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesAdapterFactory.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesAdapterFactory.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesAdapterFactory.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesResourceFactoryImpl.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesResourceFactoryImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesResourceFactoryImpl.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesResourceFactoryImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesResourceImpl.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesResourceImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesResourceImpl.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesResourceImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesSwitch.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesSwitch.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesSwitch.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesSwitch.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesXMLProcessor.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesXMLProcessor.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesXMLProcessor.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesXMLProcessor.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/CommitException.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/CommitException.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/CommitException.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/CommitException.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/IResourceSetDisposalApprover.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/IResourceSetDisposalApprover.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/IResourceSetDisposalApprover.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/IResourceSetDisposalApprover.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/IPapyrusRepositoryAdminListener.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/IPapyrusRepositoryAdminListener.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/IPapyrusRepositoryAdminListener.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/IPapyrusRepositoryAdminListener.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/PapyrusRepositoryAdminEvent.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/PapyrusRepositoryAdminEvent.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/PapyrusRepositoryAdminEvent.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/PapyrusRepositoryAdminEvent.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/PapyrusRepositoryAdminManager.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/PapyrusRepositoryAdminManager.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/PapyrusRepositoryAdminManager.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/PapyrusRepositoryAdminManager.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/exporter/IModelExportMapping.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/exporter/IModelExportMapping.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/exporter/IModelExportMapping.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/exporter/IModelExportMapping.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/exporter/IModelExporter.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/exporter/IModelExporter.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/exporter/IModelExporter.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/exporter/IModelExporter.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelDependentsProvider.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelDependentsProvider.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelDependentsProvider.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelDependentsProvider.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelImportMapping.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelImportMapping.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelImportMapping.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelImportMapping.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelImporter.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelImporter.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelImporter.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelImporter.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferConfiguration.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferConfiguration.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferConfiguration.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferConfiguration.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferListener.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferListener.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferListener.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferListener.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferMapping.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferMapping.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferMapping.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferMapping.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferMappingListener.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferMappingListener.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferMappingListener.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferMappingListener.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferNode.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferNode.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferNode.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferNode.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferOperation.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferOperation.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferOperation.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferOperation.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/ModelTransferListenerAdapter.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/ModelTransferListenerAdapter.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/ModelTransferListenerAdapter.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/ModelTransferListenerAdapter.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/ModelTransferMappingListenerAdapter.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/ModelTransferMappingListenerAdapter.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/ModelTransferMappingListenerAdapter.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/ModelTransferMappingListenerAdapter.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareCommandStack.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareCommandStack.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareCommandStack.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareCommandStack.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareModelSet.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareModelSet.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareModelSet.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareModelSet.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareModelSetServiceFactory.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareModelSetServiceFactory.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareModelSetServiceFactory.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareModelSetServiceFactory.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareProxyModificationTrackingAdapter.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareProxyModificationTrackingAdapter.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareProxyModificationTrackingAdapter.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareProxyModificationTrackingAdapter.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareTransactionalEditingDomain.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareTransactionalEditingDomain.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareTransactionalEditingDomain.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareTransactionalEditingDomain.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareTransactionalEditingDomainProvider.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareTransactionalEditingDomainProvider.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareTransactionalEditingDomainProvider.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareTransactionalEditingDomainProvider.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOReadOnlyHandler.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOReadOnlyHandler.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOReadOnlyHandler.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOReadOnlyHandler.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOUndoContext.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOUndoContext.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOUndoContext.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOUndoContext.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/PapyrusCDOResourceFactory.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/PapyrusCDOResourceFactory.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/PapyrusCDOResourceFactory.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/PapyrusCDOResourceFactory.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/PapyrusCDOResourceImpl.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/PapyrusCDOResourceImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/PapyrusCDOResourceImpl.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/PapyrusCDOResourceImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/CDOFunctions.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/CDOFunctions.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/CDOFunctions.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/CDOFunctions.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/CDOPredicates.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/CDOPredicates.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/CDOPredicates.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/CDOPredicates.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/JobWaiter.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/JobWaiter.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/JobWaiter.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/JobWaiter.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/Activator.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/Activator.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/Activator.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/Activator.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CDOProxyResolvingResourceSet.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CDOProxyResolvingResourceSet.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CDOProxyResolvingResourceSet.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CDOProxyResolvingResourceSet.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CDOUtils.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CDOUtils.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CDOUtils.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CDOUtils.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CompositeResourceSetDisposalApprover.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CompositeResourceSetDisposalApprover.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CompositeResourceSetDisposalApprover.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CompositeResourceSetDisposalApprover.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/GMFSafePackageProcessor.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/GMFSafePackageProcessor.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/GMFSafePackageProcessor.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/GMFSafePackageProcessor.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/IRepositoryModelStorage.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/IRepositoryModelStorage.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/IRepositoryModelStorage.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/IRepositoryModelStorage.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/controlmode/CDOControlModeParticipant.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/controlmode/CDOControlModeParticipant.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/controlmode/CDOControlModeParticipant.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/controlmode/CDOControlModeParticipant.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/controlmode/CDOProxyManager.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/controlmode/CDOProxyManager.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/controlmode/CDOProxyManager.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/controlmode/CDOProxyManager.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/CDODIDependentsProvider.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/CDODIDependentsProvider.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/CDODIDependentsProvider.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/CDODIDependentsProvider.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/DefaultModelExportConfigurationFactory.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/DefaultModelExportConfigurationFactory.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/DefaultModelExportConfigurationFactory.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/DefaultModelExportConfigurationFactory.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/DefaultModelExportMappingFactory.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/DefaultModelExportMappingFactory.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/DefaultModelExportMappingFactory.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/DefaultModelExportMappingFactory.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExportMapping.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExportMapping.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExportMapping.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExportMapping.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExporter.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExporter.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExporter.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExporter.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExporterFactory.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExporterFactory.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExporterFactory.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExporterFactory.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/expressions/EObjectPropertyTester.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/expressions/EObjectPropertyTester.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/expressions/EObjectPropertyTester.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/expressions/EObjectPropertyTester.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/AbstractModelImportMapping.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/AbstractModelImportMapping.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/AbstractModelImportMapping.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/AbstractModelImportMapping.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/AbstractModelTransferMapping.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/AbstractModelTransferMapping.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/AbstractModelTransferMapping.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/AbstractModelTransferMapping.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/DefaultModelImportConfigurationFactory.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/DefaultModelImportConfigurationFactory.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/DefaultModelImportConfigurationFactory.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/DefaultModelImportConfigurationFactory.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/DependencyAdapter.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/DependencyAdapter.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/DependencyAdapter.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/DependencyAdapter.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ManyToOneModelImportMapping.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ManyToOneModelImportMapping.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ManyToOneModelImportMapping.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ManyToOneModelImportMapping.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ManyToOneModelImportMappingFactory.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ManyToOneModelImportMappingFactory.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ManyToOneModelImportMappingFactory.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ManyToOneModelImportMappingFactory.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelImporter.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelImporter.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelImporter.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelImporter.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelImporterFactory.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelImporterFactory.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelImporterFactory.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelImporterFactory.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelTransferConfiguration.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelTransferConfiguration.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelTransferConfiguration.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelTransferConfiguration.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelTransferNode.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelTransferNode.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelTransferNode.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelTransferNode.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/OneToOneModelImportMapping.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/OneToOneModelImportMapping.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/OneToOneModelImportMapping.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/OneToOneModelImportMapping.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/OneToOneModelImportMappingFactory.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/OneToOneModelImportMappingFactory.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/OneToOneModelImportMappingFactory.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/OneToOneModelImportMappingFactory.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ReentrantOperationContext.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ReentrantOperationContext.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ReentrantOperationContext.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ReentrantOperationContext.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/WorkspaceDIDependentsProvider.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/WorkspaceDIDependentsProvider.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/WorkspaceDIDependentsProvider.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/WorkspaceDIDependentsProvider.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/l10n/Messages.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/l10n/Messages.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/l10n/Messages.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/l10n/Messages.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/l10n/messages.properties b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/l10n/messages.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/l10n/messages.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/l10n/messages.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/resource/CDOSashModelProvider.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/resource/CDOSashModelProvider.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/resource/CDOSashModelProvider.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/resource/CDOSashModelProvider.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/services/localizer/CDOAwareObjectLocalizer.java b/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/services/localizer/CDOAwareObjectLocalizer.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/services/localizer/CDOAwareObjectLocalizer.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/services/localizer/CDOAwareObjectLocalizer.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.classpath b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.classpath
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.classpath
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.classpath
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.project b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.project
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.project
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.project
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.core.resources.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.core.resources.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.jdt.core.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.jdt.core.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.jdt.ui.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.jdt.ui.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/about.html b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/about.html
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/about.html
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/about.html
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/build.properties b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/build.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/build.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/build.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.properties b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.xml b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.xml
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/pom.xml b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/pom.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/pom.xml
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/pom.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/Activator.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/Activator.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/Activator.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/Activator.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/messages/Messages.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/messages/Messages.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/messages/Messages.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/messages/Messages.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/messages/messages.properties b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/messages/messages.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/messages/messages.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/messages/messages.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOContextStorageProvider.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOContextStorageProvider.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOContextStorageProvider.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOContextStorageProvider.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOTextDelegatingResourceFactory.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOTextDelegatingResourceFactory.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOTextDelegatingResourceFactory.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOTextDelegatingResourceFactory.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOTextURIHandler.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOTextURIHandler.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOTextURIHandler.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOTextURIHandler.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/ClobInputStream.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/ClobInputStream.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/ClobInputStream.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/ClobInputStream.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/ClobOutputStream.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/ClobOutputStream.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/ClobOutputStream.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/ClobOutputStream.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/AbstractCDOContextAction.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/AbstractCDOContextAction.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/AbstractCDOContextAction.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/AbstractCDOContextAction.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextCopyAction.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextCopyAction.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextCopyAction.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextCopyAction.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextDeleteAction.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextDeleteAction.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextDeleteAction.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextDeleteAction.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextEditAction.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextEditAction.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextEditAction.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextEditAction.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextStorageActionProvider.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextStorageActionProvider.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextStorageActionProvider.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextStorageActionProvider.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOResourceEditorInput.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOResourceEditorInput.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOResourceEditorInput.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOResourceEditorInput.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.project b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.project
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.project
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.project
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.core.resources.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.core.resources.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.ui.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.ui.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.m2e.core.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.m2e.core.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.m2e.core.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.pde.api.tools.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.pde.api.tools.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/about.html b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/about.html
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/about.html
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/about.html
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/build.properties b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/build.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/build.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/build.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/plugin.properties b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/plugin.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/plugin.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/plugin.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/plugin.xml b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/plugin.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/plugin.xml
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/plugin.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/pom.xml b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/pom.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/pom.xml
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/pom.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.markdown b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.markdown
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.markdown
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.markdown
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/cdo-main-toc.xml b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/cdo-main-toc.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/cdo-main-toc.xml
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/cdo-main-toc.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/addrepo.png b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/addrepo.png
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/addrepo.png
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/addrepo.png
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start.markdown b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start.markdown
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start.markdown
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start.markdown
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/discovery_dialog.png b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/discovery_dialog.png
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/discovery_dialog.png
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/discovery_dialog.png
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/importmodels.png b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/importmodels.png
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/importmodels.png
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/importmodels.png
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/modelreposview.png b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/modelreposview.png
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/modelreposview.png
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/modelreposview.png
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/validation.png b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/validation.png
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/validation.png
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/validation.png
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.markdown b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.markdown
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.markdown
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.markdown
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/conflict.png b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/conflict.png
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/conflict.png
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/conflict.png
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/locked.png b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/locked.png
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/locked.png
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/locked.png
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/remotely_locked.png b/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/remotely_locked.png
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/remotely_locked.png
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/remotely_locked.png
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.classpath b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.classpath
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.classpath
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.classpath
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.project b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.project
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.project
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.project
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.core.resources.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.core.resources.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.jdt.core.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.jdt.core.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.jdt.ui.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.jdt.ui.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/META-INF/MANIFEST.MF
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/about.html b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/about.html
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/about.html
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/about.html
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/build.properties b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/build.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/build.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/build.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/icons/full/obj16/document.png b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/icons/full/obj16/document.png
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/icons/full/obj16/document.png
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/icons/full/obj16/document.png
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.properties b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.xml b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.xml
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/pom.xml b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/pom.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/pom.xml
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/pom.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/Activator.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/Activator.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/Activator.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/Activator.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOHyperlinkConstants.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOHyperlinkConstants.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOHyperlinkConstants.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOHyperlinkConstants.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlink.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlink.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlink.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlink.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlinkEditorShell.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlinkEditorShell.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlinkEditorShell.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlinkEditorShell.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlinkHelper.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlinkHelper.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlinkHelper.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlinkHelper.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlinkLabelProvider.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlinkLabelProvider.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlinkLabelProvider.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlinkLabelProvider.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceURIDropStrategy.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceURIDropStrategy.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceURIDropStrategy.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceURIDropStrategy.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CreateCDOResourceHyperlinkCommand.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CreateCDOResourceHyperlinkCommand.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CreateCDOResourceHyperlinkCommand.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CreateCDOResourceHyperlinkCommand.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/Messages.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/Messages.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/Messages.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/Messages.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/messages.properties b/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/messages.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/messages.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/messages.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/.classpath b/cdo/bundles/org.eclipse.papyrus.cdo.ui/.classpath
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/.classpath
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/.classpath
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/.project b/cdo/bundles/org.eclipse.papyrus.cdo.ui/.project
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/.project
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/.project
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.core.resources.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.core.resources.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.jdt.core.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.jdt.core.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.jdt.ui.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.jdt.ui.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/about.html b/cdo/bundles/org.eclipse.papyrus.cdo.ui/about.html
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/about.html
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/about.html
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/build.properties b/cdo/bundles/org.eclipse.papyrus.cdo.ui/build.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/build.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/build.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/add_repo.gif b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/add_repo.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/add_repo.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/add_repo.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/add_repo.pxm b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/add_repo.pxm
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/add_repo.pxm
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/add_repo.pxm
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/link_editor.gif b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/link_editor.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/link_editor.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/link_editor.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/connect_co.gif b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/connect_co.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/connect_co.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/connect_co.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/connect_co.pxm b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/connect_co.pxm
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/connect_co.pxm
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/connect_co.pxm
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/disconnect_co.gif b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/disconnect_co.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/disconnect_co.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/disconnect_co.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/connect_co.gif b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/connect_co.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/connect_co.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/connect_co.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/connect_co.pxm b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/connect_co.pxm
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/connect_co.pxm
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/connect_co.pxm
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/disconnect_co.gif b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/disconnect_co.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/disconnect_co.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/disconnect_co.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/newfolder_co.gif b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/newfolder_co.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/newfolder_co.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/newfolder_co.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/papyrus_model.gif b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/papyrus_model.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/papyrus_model.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/papyrus_model.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_closed.gif b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_closed.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_closed.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_closed.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_closed.pxm b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_closed.pxm
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_closed.pxm
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_closed.pxm
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_open.gif b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_open.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_open.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_open.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/conflicted.gif b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/conflicted.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/conflicted.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/conflicted.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/dependent.gif b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/dependent.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/dependent.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/dependent.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/dependent.pxm b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/dependent.pxm
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/dependent.pxm
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/dependent.pxm
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/other_locked.gif b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/other_locked.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/other_locked.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/other_locked.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/self_locked.gif b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/self_locked.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/self_locked.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/self_locked.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/conflicted.gif b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/conflicted.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/conflicted.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/conflicted.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/conflicted.pxm b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/conflicted.pxm
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/conflicted.pxm
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/conflicted.pxm
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/other_locked.gif b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/other_locked.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/other_locked.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/other_locked.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/other_locked.pxm b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/other_locked.pxm
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/other_locked.pxm
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/other_locked.pxm
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/self_locked.gif b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/self_locked.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/self_locked.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/self_locked.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/self_locked.pxm b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/self_locked.pxm
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/self_locked.pxm
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/self_locked.pxm
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/view16/model_repositories.gif b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/view16/model_repositories.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/view16/model_repositories.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/view16/model_repositories.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/view16/model_repositories.pxm b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/view16/model_repositories.pxm
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/view16/model_repositories.pxm
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/view16/model_repositories.pxm
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/wizban/Papyrus_CDO.png b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/wizban/Papyrus_CDO.png
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/wizban/Papyrus_CDO.png
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/wizban/Papyrus_CDO.png
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/wizban/Papyrus_CDO.pxm b/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/wizban/Papyrus_CDO.pxm
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/wizban/Papyrus_CDO.pxm
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/wizban/Papyrus_CDO.pxm
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/model/DND.ecore b/cdo/bundles/org.eclipse.papyrus.cdo.ui/model/DND.ecore
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/model/DND.ecore
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/model/DND.ecore
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/model/DND.ecorediag b/cdo/bundles/org.eclipse.papyrus.cdo.ui/model/DND.ecorediag
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/model/DND.ecorediag
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/model/DND.ecorediag
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/plugin.properties b/cdo/bundles/org.eclipse.papyrus.cdo.ui/plugin.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/plugin.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/plugin.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/plugin.xml b/cdo/bundles/org.eclipse.papyrus.cdo.ui/plugin.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/plugin.xml
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/plugin.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/pom.xml b/cdo/bundles/org.eclipse.papyrus.cdo.ui/pom.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/pom.xml
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/pom.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/schema/repositoryFilters.exsd b/cdo/bundles/org.eclipse.papyrus.cdo.ui/schema/repositoryFilters.exsd
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/schema/repositoryFilters.exsd
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/schema/repositoryFilters.exsd
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/Activator.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/Activator.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/Activator.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/Activator.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/SharedImages.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/SharedImages.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/SharedImages.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/SharedImages.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/adapters/CDOAdapterFactory.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/adapters/CDOAdapterFactory.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/adapters/CDOAdapterFactory.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/adapters/CDOAdapterFactory.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/adapters/EditorAdapterFactory.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/adapters/EditorAdapterFactory.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/adapters/EditorAdapterFactory.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/adapters/EditorAdapterFactory.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateAdapter.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateAdapter.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateAdapter.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateAdapter.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateDiagramDecorator.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateDiagramDecorator.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateDiagramDecorator.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateDiagramDecorator.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateLabelDecorator.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateLabelDecorator.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateLabelDecorator.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateLabelDecorator.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/DiagramDecoratorProvider.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/DiagramDecoratorProvider.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/DiagramDecoratorProvider.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/DiagramDecoratorProvider.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusConnectionEditPartStylizer.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusConnectionEditPartStylizer.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusConnectionEditPartStylizer.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusConnectionEditPartStylizer.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusEditPartStylizer.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusEditPartStylizer.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusEditPartStylizer.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusEditPartStylizer.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusElementStylizer.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusElementStylizer.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusElementStylizer.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusElementStylizer.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusElementStylizerFactory.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusElementStylizerFactory.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusElementStylizerFactory.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusElementStylizerFactory.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusNodeEditPartStylizer.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusNodeEditPartStylizer.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusNodeEditPartStylizer.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusNodeEditPartStylizer.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CheckoutBrowseDialog.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CheckoutBrowseDialog.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CheckoutBrowseDialog.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CheckoutBrowseDialog.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CheckoutSelectionDialog.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CheckoutSelectionDialog.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CheckoutSelectionDialog.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CheckoutSelectionDialog.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CreateCDOModelFragmentDialog.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CreateCDOModelFragmentDialog.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CreateCDOModelFragmentDialog.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CreateCDOModelFragmentDialog.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/CDOResourceURITransferData.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/CDOResourceURITransferData.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/CDOResourceURITransferData.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/CDOResourceURITransferData.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDragAdapter.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDragAdapter.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDragAdapter.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDragAdapter.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropActionDelegate.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropActionDelegate.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropActionDelegate.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropActionDelegate.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropAdapter.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropAdapter.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropAdapter.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropAdapter.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropAdapterAssistant.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropAdapterAssistant.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropAdapterAssistant.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropAdapterAssistant.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnEditorAdapter.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnEditorAdapter.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnEditorAdapter.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnEditorAdapter.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnGraphicalEditorSupport.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnGraphicalEditorSupport.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnGraphicalEditorSupport.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnGraphicalEditorSupport.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnGraphicalEditorSupportServiceFactory.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnGraphicalEditorSupportServiceFactory.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnGraphicalEditorSupportServiceFactory.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnGraphicalEditorSupportServiceFactory.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorInput.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorInput.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorInput.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorInput.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorManager.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorManager.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorManager.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorManager.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorOpener.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorOpener.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorOpener.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorOpener.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFEditorSupport.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFEditorSupport.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFEditorSupport.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFEditorSupport.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFHandler.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFHandler.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFHandler.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFHandler.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFLockingHandler.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFLockingHandler.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFLockingHandler.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFLockingHandler.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusTransactionListener.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusTransactionListener.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusTransactionListener.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusTransactionListener.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/expressions/CDOObjectPropertyTester.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/expressions/CDOObjectPropertyTester.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/expressions/CDOObjectPropertyTester.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/expressions/CDOObjectPropertyTester.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ExportModelHandler.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ExportModelHandler.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ExportModelHandler.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ExportModelHandler.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ImportModelsHandler.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ImportModelsHandler.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ImportModelsHandler.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ImportModelsHandler.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/LockObjectsHandler.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/LockObjectsHandler.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/LockObjectsHandler.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/LockObjectsHandler.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ResolveConflictsHandler.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ResolveConflictsHandler.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ResolveConflictsHandler.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ResolveConflictsHandler.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/UIHandlerUtil.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/UIHandlerUtil.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/UIHandlerUtil.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/UIHandlerUtil.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/UnlockObjectsHandler.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/UnlockObjectsHandler.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/UnlockObjectsHandler.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/UnlockObjectsHandler.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/l10n/Messages.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/l10n/Messages.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/l10n/Messages.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/l10n/Messages.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/l10n/messages.properties b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/l10n/messages.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/l10n/messages.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/l10n/messages.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOMarkerMonitor.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOMarkerMonitor.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOMarkerMonitor.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOMarkerMonitor.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOMarkerProvider.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOMarkerProvider.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOMarkerProvider.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOMarkerProvider.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOPapyrusMarker.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOPapyrusMarker.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOPapyrusMarker.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOPapyrusMarker.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/providers/CDOResourceLabelProvider.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/providers/CDOResourceLabelProvider.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/providers/CDOResourceLabelProvider.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/providers/CDOResourceLabelProvider.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/providers/ModelImportNodeLabelProvider.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/providers/ModelImportNodeLabelProvider.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/providers/ModelImportNodeLabelProvider.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/providers/ModelImportNodeLabelProvider.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/CompositeLabelProvider.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/CompositeLabelProvider.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/CompositeLabelProvider.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/CompositeLabelProvider.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/UISafeProgressMonitor.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/UISafeProgressMonitor.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/UISafeProgressMonitor.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/UISafeProgressMonitor.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/UIUtil.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/UIUtil.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/UIUtil.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/UIUtil.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/CheckoutItemProvider.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/CheckoutItemProvider.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/CheckoutItemProvider.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/CheckoutItemProvider.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIModel.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIModel.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIModel.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIModel.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIResourceQuery.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIResourceQuery.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIResourceQuery.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIResourceQuery.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/ItemProviderFilterRegistry.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/ItemProviderFilterRegistry.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/ItemProviderFilterRegistry.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/ItemProviderFilterRegistry.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/widgets/ActionButton.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/widgets/ActionButton.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/widgets/ActionButton.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/widgets/ActionButton.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/CheckoutSelectionBlock.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/CheckoutSelectionBlock.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/CheckoutSelectionBlock.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/CheckoutSelectionBlock.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/CheckoutSelectionPage.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/CheckoutSelectionPage.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/CheckoutSelectionPage.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/CheckoutSelectionPage.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/LocalRepositoryView.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/LocalRepositoryView.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/LocalRepositoryView.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/LocalRepositoryView.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelExportMappingsPage.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelExportMappingsPage.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelExportMappingsPage.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelExportMappingsPage.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelExportWizard.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelExportWizard.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelExportWizard.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelExportWizard.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelImportWizard.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelImportWizard.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelImportWizard.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelImportWizard.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelImportWizardPage.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelImportWizardPage.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelImportWizardPage.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelImportWizardPage.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelMappingsPage.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelMappingsPage.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelMappingsPage.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelMappingsPage.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelReferencesPage.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelReferencesPage.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelReferencesPage.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelReferencesPage.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/WizardOperationContext.java b/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/WizardOperationContext.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/WizardOperationContext.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/WizardOperationContext.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.classpath b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.classpath
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.classpath
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.classpath
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.project b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.project
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.project
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.project
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.settings/org.eclipse.jdt.core.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.settings/org.eclipse.jdt.core.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.settings/org.eclipse.jdt.ui.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.settings/org.eclipse.jdt.ui.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/about.html b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/about.html
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/about.html
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/about.html
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/build.properties b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/build.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/build.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/build.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/icons/full/elcl16/newmodel_co.gif b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/icons/full/elcl16/newmodel_co.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/icons/full/elcl16/newmodel_co.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/icons/full/elcl16/newmodel_co.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/icons/full/elcl16/newmodel_co.pxm b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/icons/full/elcl16/newmodel_co.pxm
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/icons/full/elcl16/newmodel_co.pxm
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/icons/full/elcl16/newmodel_co.pxm
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.properties b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.xml b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.xml
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/pom.xml b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/pom.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/pom.xml
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/pom.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/Activator.java b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/Activator.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/Activator.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/Activator.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/handlers/NewModelHandler.java b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/handlers/NewModelHandler.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/handlers/NewModelHandler.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/handlers/NewModelHandler.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/l10n/Messages.java b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/l10n/Messages.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/l10n/Messages.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/l10n/Messages.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/l10n/messages.properties b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/l10n/messages.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/l10n/messages.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/l10n/messages.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/CDONewModelStorageProvider.java b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/CDONewModelStorageProvider.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/CDONewModelStorageProvider.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/CDONewModelStorageProvider.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/NewModelPage.java b/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/NewModelPage.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/NewModelPage.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/NewModelPage.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.classpath b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.classpath
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.classpath
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.classpath
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.project b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.project
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.project
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.project
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.settings/org.eclipse.jdt.core.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.settings/org.eclipse.jdt.core.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.settings/org.eclipse.jdt.ui.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.settings/org.eclipse.jdt.ui.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/about.html b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/about.html
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/about.html
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/about.html
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/build.properties b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/build.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/build.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/build.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/plugin.properties b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/plugin.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/plugin.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/plugin.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/plugin.xml b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/plugin.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/plugin.xml
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/plugin.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/pom.xml b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/pom.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/pom.xml
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/pom.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/Activator.java b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/Activator.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/Activator.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/Activator.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/open/CDOOpenElementService.java b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/open/CDOOpenElementService.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/open/CDOOpenElementService.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/open/CDOOpenElementService.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/AttributeMatchStrategy.java b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/AttributeMatchStrategy.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/AttributeMatchStrategy.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/AttributeMatchStrategy.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/CDOPapyrusQuery.java b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/CDOPapyrusQuery.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/CDOPapyrusQuery.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/CDOPapyrusQuery.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/CDOSearchQueryProvider.java b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/CDOSearchQueryProvider.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/CDOSearchQueryProvider.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/CDOSearchQueryProvider.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/PatternUtil.java b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/PatternUtil.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/PatternUtil.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/PatternUtil.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/scope/CDOScopeProvider.java b/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/scope/CDOScopeProvider.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/scope/CDOScopeProvider.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/scope/CDOScopeProvider.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.classpath b/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.classpath
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.classpath
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.classpath
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.project b/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.project
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.project
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.project
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.settings/org.eclipse.jdt.core.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.settings/org.eclipse.jdt.core.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.settings/org.eclipse.jdt.ui.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.settings/org.eclipse.jdt.ui.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/about.html b/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/about.html
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/about.html
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/about.html
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/build.properties b/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/build.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/build.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/build.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/plugin.properties b/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/plugin.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/plugin.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/plugin.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/plugin.xml b/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/plugin.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/plugin.xml
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/plugin.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/pom.xml b/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/pom.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/pom.xml
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/pom.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/Activator.java b/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/Activator.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/Activator.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/Activator.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/importsources/CDOPackageImportSource.java b/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/importsources/CDOPackageImportSource.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/importsources/CDOPackageImportSource.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/importsources/CDOPackageImportSource.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/l10n/Messages.java b/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/l10n/Messages.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/l10n/Messages.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/l10n/Messages.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/l10n/messages.properties b/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/l10n/messages.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/l10n/messages.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/l10n/messages.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.classpath b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.classpath
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.classpath
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.classpath
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.project b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.project
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.project
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.project
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.settings/org.eclipse.jdt.core.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.settings/org.eclipse.jdt.core.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.settings/org.eclipse.jdt.ui.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.settings/org.eclipse.jdt.ui.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/META-INF/MANIFEST.MF
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/about.html b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/about.html
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/about.html
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/about.html
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/build.properties b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/build.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/build.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/build.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblem_attributes_Attribute.gif b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblem_attributes_Attribute.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblem_attributes_Attribute.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblem_attributes_Attribute.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblemsContainer_problems_EProblem.gif b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblemsContainer_problems_EProblem.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblemsContainer_problems_EProblem.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblemsContainer_problems_EProblem.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblemsContainer_subcontainers_EProblemsContainer.gif b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblemsContainer_subcontainers_EProblemsContainer.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblemsContainer_subcontainers_EProblemsContainer.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblemsContainer_subcontainers_EProblemsContainer.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/Attribute.gif b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/Attribute.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/Attribute.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/Attribute.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/EProblem.gif b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/EProblem.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/EProblem.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/EProblem.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/EProblemsContainer.gif b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/EProblemsContainer.gif
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/EProblemsContainer.gif
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/EProblemsContainer.gif
Binary files differ
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.properties b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.xml b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.xml
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/pom.xml b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/pom.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/pom.xml
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/pom.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/edit/IProblemTypeProvider.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/edit/IProblemTypeProvider.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/edit/IProblemTypeProvider.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/edit/IProblemTypeProvider.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/edit/ProblemEditUtil.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/edit/ProblemEditUtil.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/edit/ProblemEditUtil.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/edit/ProblemEditUtil.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/edit/ProblemTypeItemProviderAdapter.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/edit/ProblemTypeItemProviderAdapter.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/edit/ProblemTypeItemProviderAdapter.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/edit/ProblemTypeItemProviderAdapter.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/AttributeItemProvider.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/AttributeItemProvider.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/AttributeItemProvider.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/AttributeItemProvider.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/EProblemItemProvider.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/EProblemItemProvider.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/EProblemItemProvider.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/EProblemItemProvider.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/EProblemsContainerItemProvider.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/EProblemsContainerItemProvider.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/EProblemsContainerItemProvider.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/EProblemsContainerItemProvider.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/ProblemsEditPlugin.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/ProblemsEditPlugin.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/ProblemsEditPlugin.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/ProblemsEditPlugin.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/ProblemsItemProviderAdapterFactory.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/ProblemsItemProviderAdapterFactory.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/ProblemsItemProviderAdapterFactory.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/ProblemsItemProviderAdapterFactory.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.classpath b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.classpath
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.classpath
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.classpath
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.project b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.project
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.project
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.project
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.settings/org.eclipse.jdt.core.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.settings/org.eclipse.jdt.core.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.settings/org.eclipse.jdt.ui.prefs b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.settings/org.eclipse.jdt.ui.prefs
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/META-INF/CDO.MF b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/META-INF/CDO.MF
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/META-INF/CDO.MF
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/META-INF/CDO.MF
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/META-INF/MANIFEST.MF
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/about.html b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/about.html
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/about.html
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/about.html
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/build.properties b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/build.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/build.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/build.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/model/Problems.ecore b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/model/Problems.ecore
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/model/Problems.ecore
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/model/Problems.ecore
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/model/Problems.ecorediag b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/model/Problems.ecorediag
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/model/Problems.ecorediag
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/model/Problems.ecorediag
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/model/Problems.genmodel b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/model/Problems.genmodel
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/model/Problems.genmodel
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/model/Problems.genmodel
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/plugin.properties b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/plugin.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/plugin.properties
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/plugin.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/plugin.xml b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/plugin.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/plugin.xml
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/plugin.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/pom.xml b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/pom.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/pom.xml
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/pom.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/EProblem.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/EProblem.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/EProblem.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/EProblem.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/EProblemsContainer.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/EProblemsContainer.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/EProblemsContainer.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/EProblemsContainer.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ESeverity.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ESeverity.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ESeverity.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ESeverity.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ProblemsFactory.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ProblemsFactory.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ProblemsFactory.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ProblemsFactory.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ProblemsPackage.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ProblemsPackage.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ProblemsPackage.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ProblemsPackage.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/AttributeImpl.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/AttributeImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/AttributeImpl.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/AttributeImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/EProblemImpl.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/EProblemImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/EProblemImpl.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/EProblemImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/EProblemsContainerImpl.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/EProblemsContainerImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/EProblemsContainerImpl.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/EProblemsContainerImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/ProblemsFactoryImpl.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/ProblemsFactoryImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/ProblemsFactoryImpl.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/ProblemsFactoryImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/ProblemsPackageImpl.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/ProblemsPackageImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/ProblemsPackageImpl.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/ProblemsPackageImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/internal/ProblemsPlugin.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/internal/ProblemsPlugin.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/internal/ProblemsPlugin.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/internal/ProblemsPlugin.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsAdapterFactory.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsAdapterFactory.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsAdapterFactory.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsAdapterFactory.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsEvent.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsEvent.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsEvent.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsEvent.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsListener.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsListener.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsListener.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsListener.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsManager.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsManager.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsManager.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsManager.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsSwitch.java b/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsSwitch.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsSwitch.java
rename to cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsSwitch.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.classpath b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.classpath
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.classpath
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.classpath
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.project b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.project
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.project
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.project
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.core.resources.prefs b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.core.resources.prefs
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.core.runtime.prefs b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.core.runtime.prefs
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.jdt.core.prefs b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.jdt.core.prefs
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.jdt.ui.prefs b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.jdt.ui.prefs
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.pde.api.tools.prefs b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.pde.api.tools.prefs
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/META-INF/MANIFEST.MF
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/Migrate gmfdiag.css to CDO.launch b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/Migrate gmfdiag.css to CDO.launch
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/Migrate gmfdiag.css to CDO.launch
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/Migrate gmfdiag.css to CDO.launch
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/about.html b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/about.html
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/about.html
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/about.html
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/build.properties b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/build.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/build.properties
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/build.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/migrate.ant b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/migrate.ant
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/migrate.ant
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/migrate.ant
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/plugin.properties b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/plugin.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/plugin.properties
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/plugin.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/plugin.xml b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/plugin.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/plugin.xml
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/plugin.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/pom.xml b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/pom.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/pom.xml
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/pom.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSArrowStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSArrowStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSArrowStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSArrowStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSBasicCompartmentImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSBasicCompartmentImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSBasicCompartmentImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSBasicCompartmentImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSBasicSemanticCompartmentImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSBasicSemanticCompartmentImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSBasicSemanticCompartmentImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSBasicSemanticCompartmentImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSCanonicalStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSCanonicalStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSCanonicalStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSCanonicalStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSCompartmentImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSCompartmentImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSCompartmentImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSCompartmentImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSConnectorImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSConnectorImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSConnectorImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSConnectorImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSConnectorStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSConnectorStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSConnectorStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSConnectorStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDataTypeStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDataTypeStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDataTypeStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDataTypeStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDecorationNodeImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDecorationNodeImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDecorationNodeImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDecorationNodeImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDescriptionStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDescriptionStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDescriptionStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDescriptionStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDiagramLinkStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDiagramLinkStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDiagramLinkStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDiagramLinkStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDiagramStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDiagramStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDiagramStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDiagramStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDrawerStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDrawerStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDrawerStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSDrawerStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSEdgeImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSEdgeImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSEdgeImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSEdgeImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSFillStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSFillStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSFillStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSFillStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSFilteringStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSFilteringStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSFilteringStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSFilteringStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSFontStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSFontStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSFontStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSFontStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSGuideStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSGuideStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSGuideStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSGuideStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSHintedDiagramLinkStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSHintedDiagramLinkStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSHintedDiagramLinkStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSHintedDiagramLinkStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSImageBufferStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSImageBufferStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSImageBufferStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSImageBufferStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSImageStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSImageStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSImageStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSImageStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSLineStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSLineStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSLineStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSLineStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSLineTypeStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSLineTypeStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSLineTypeStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSLineTypeStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSListCompartmentImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSListCompartmentImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSListCompartmentImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSListCompartmentImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSMultiDiagramLinkStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSMultiDiagramLinkStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSMultiDiagramLinkStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSMultiDiagramLinkStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSNamedStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSNamedStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSNamedStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSNamedStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSNodeImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSNodeImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSNodeImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSNodeImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSPageStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSPageStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSPageStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSPageStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSPropertiesSetStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSPropertiesSetStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSPropertiesSetStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSPropertiesSetStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSRoundedCornersStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSRoundedCornersStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSRoundedCornersStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSRoundedCornersStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSRoutingStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSRoutingStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSRoutingStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSRoutingStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSSemanticListCompartmentImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSSemanticListCompartmentImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSSemanticListCompartmentImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSSemanticListCompartmentImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSShapeImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSShapeImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSShapeImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSShapeImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSShapeStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSShapeStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSShapeStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSShapeStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSSortingStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSSortingStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSSortingStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSSortingStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSStandardDiagramImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSStandardDiagramImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSStandardDiagramImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSStandardDiagramImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSTextStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSTextStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSTextStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSTextStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSTitleStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSTitleStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSTitleStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/CSSTitleStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/factory/CSSNotationFactory.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/factory/CSSNotationFactory.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/factory/CSSNotationFactory.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/factory/CSSNotationFactory.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/notation/CSSDiagramImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/notation/CSSDiagramImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/notation/CSSDiagramImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.css.cdo/src/org/eclipse/papyrus/infra/gmfdiag/css/cdo/notation/CSSDiagramImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.classpath b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.classpath
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.classpath
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.classpath
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.project b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.project
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.project
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.project
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.core.resources.prefs b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.core.resources.prefs
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.core.runtime.prefs b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.core.runtime.prefs
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.jdt.core.prefs b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.jdt.core.prefs
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.jdt.ui.prefs b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.jdt.ui.prefs
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.pde.api.tools.prefs b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.pde.api.tools.prefs
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/META-INF/MANIFEST.MF b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/META-INF/MANIFEST.MF
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/Migrate gmfdiag.style to CDO.launch b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/Migrate gmfdiag.style to CDO.launch
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/Migrate gmfdiag.style to CDO.launch
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/Migrate gmfdiag.style to CDO.launch
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/about.html b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/about.html
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/about.html
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/about.html
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/build.properties b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/build.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/build.properties
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/build.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/migrate.ant b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/migrate.ant
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/migrate.ant
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/migrate.ant
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/plugin.properties b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/plugin.properties
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/plugin.properties
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/plugin.properties
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/plugin.xml b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/plugin.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/plugin.xml
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/plugin.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/pom.xml b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/pom.xml
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/pom.xml
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/pom.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/cdo/impl/PapyrusDiagramStyleImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/cdo/impl/PapyrusDiagramStyleImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/cdo/impl/PapyrusDiagramStyleImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/cdo/impl/PapyrusDiagramStyleImpl.java
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/cdo/impl/StyleFactoryImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/cdo/impl/StyleFactoryImpl.java
similarity index 100%
rename from plugins/cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/cdo/impl/StyleFactoryImpl.java
rename to cdo/bundles/org.eclipse.papyrus.infra.gmfdiag.style.cdo/src-gen/org/eclipse/papyrus/infra/gmfdiag/style/cdo/impl/StyleFactoryImpl.java
diff --git a/plugins/cdo/bundles/pom.xml b/cdo/bundles/pom.xml
similarity index 100%
rename from plugins/cdo/bundles/pom.xml
rename to cdo/bundles/pom.xml
diff --git a/plugins/cdo/features/org.eclipse.papyrus.cdo.feature/.project b/cdo/features/org.eclipse.papyrus.cdo.feature/.project
similarity index 100%
rename from plugins/cdo/features/org.eclipse.papyrus.cdo.feature/.project
rename to cdo/features/org.eclipse.papyrus.cdo.feature/.project
diff --git a/plugins/cdo/features/org.eclipse.papyrus.cdo.feature/build.properties b/cdo/features/org.eclipse.papyrus.cdo.feature/build.properties
similarity index 100%
rename from plugins/cdo/features/org.eclipse.papyrus.cdo.feature/build.properties
rename to cdo/features/org.eclipse.papyrus.cdo.feature/build.properties
diff --git a/plugins/cdo/features/org.eclipse.papyrus.cdo.feature/feature.properties b/cdo/features/org.eclipse.papyrus.cdo.feature/feature.properties
similarity index 100%
rename from plugins/cdo/features/org.eclipse.papyrus.cdo.feature/feature.properties
rename to cdo/features/org.eclipse.papyrus.cdo.feature/feature.properties
diff --git a/plugins/cdo/features/org.eclipse.papyrus.cdo.feature/feature.xml b/cdo/features/org.eclipse.papyrus.cdo.feature/feature.xml
similarity index 100%
rename from plugins/cdo/features/org.eclipse.papyrus.cdo.feature/feature.xml
rename to cdo/features/org.eclipse.papyrus.cdo.feature/feature.xml
diff --git a/plugins/cdo/features/org.eclipse.papyrus.cdo.feature/pom.xml b/cdo/features/org.eclipse.papyrus.cdo.feature/pom.xml
similarity index 100%
rename from plugins/cdo/features/org.eclipse.papyrus.cdo.feature/pom.xml
rename to cdo/features/org.eclipse.papyrus.cdo.feature/pom.xml
diff --git a/plugins/cdo/features/org.eclipse.papyrus.cdo.models.feature/.project b/cdo/features/org.eclipse.papyrus.cdo.models.feature/.project
similarity index 100%
rename from plugins/cdo/features/org.eclipse.papyrus.cdo.models.feature/.project
rename to cdo/features/org.eclipse.papyrus.cdo.models.feature/.project
diff --git a/plugins/cdo/features/org.eclipse.papyrus.cdo.models.feature/build.properties b/cdo/features/org.eclipse.papyrus.cdo.models.feature/build.properties
similarity index 100%
rename from plugins/cdo/features/org.eclipse.papyrus.cdo.models.feature/build.properties
rename to cdo/features/org.eclipse.papyrus.cdo.models.feature/build.properties
diff --git a/plugins/cdo/features/org.eclipse.papyrus.cdo.models.feature/feature.properties b/cdo/features/org.eclipse.papyrus.cdo.models.feature/feature.properties
similarity index 100%
rename from plugins/cdo/features/org.eclipse.papyrus.cdo.models.feature/feature.properties
rename to cdo/features/org.eclipse.papyrus.cdo.models.feature/feature.properties
diff --git a/plugins/cdo/features/org.eclipse.papyrus.cdo.models.feature/feature.xml b/cdo/features/org.eclipse.papyrus.cdo.models.feature/feature.xml
similarity index 100%
rename from plugins/cdo/features/org.eclipse.papyrus.cdo.models.feature/feature.xml
rename to cdo/features/org.eclipse.papyrus.cdo.models.feature/feature.xml
diff --git a/plugins/cdo/features/org.eclipse.papyrus.cdo.models.feature/pom.xml b/cdo/features/org.eclipse.papyrus.cdo.models.feature/pom.xml
similarity index 100%
rename from plugins/cdo/features/org.eclipse.papyrus.cdo.models.feature/pom.xml
rename to cdo/features/org.eclipse.papyrus.cdo.models.feature/pom.xml
diff --git a/plugins/cdo/features/pom.xml b/cdo/features/pom.xml
similarity index 100%
rename from plugins/cdo/features/pom.xml
rename to cdo/features/pom.xml
diff --git a/plugins/cdo/pom.xml b/cdo/pom.xml
similarity index 100%
rename from plugins/cdo/pom.xml
rename to cdo/pom.xml
diff --git a/plugins/cdo/releng/org.eclipse.papyrus.cdo.p2/.project b/cdo/releng/org.eclipse.papyrus.cdo.p2/.project
similarity index 100%
rename from plugins/cdo/releng/org.eclipse.papyrus.cdo.p2/.project
rename to cdo/releng/org.eclipse.papyrus.cdo.p2/.project
diff --git a/plugins/cdo/releng/org.eclipse.papyrus.cdo.p2/category.xml b/cdo/releng/org.eclipse.papyrus.cdo.p2/category.xml
similarity index 100%
rename from plugins/cdo/releng/org.eclipse.papyrus.cdo.p2/category.xml
rename to cdo/releng/org.eclipse.papyrus.cdo.p2/category.xml
diff --git a/plugins/cdo/releng/org.eclipse.papyrus.cdo.p2/pom.xml b/cdo/releng/org.eclipse.papyrus.cdo.p2/pom.xml
similarity index 100%
rename from plugins/cdo/releng/org.eclipse.papyrus.cdo.p2/pom.xml
rename to cdo/releng/org.eclipse.papyrus.cdo.p2/pom.xml
diff --git a/plugins/cdo/releng/pom.xml b/cdo/releng/pom.xml
similarity index 100%
rename from plugins/cdo/releng/pom.xml
rename to cdo/releng/pom.xml
diff --git a/plugins/cdo/releng/targetplatforms/eclipse/org.eclipse.papyrus.cdo.targetplatform.target b/cdo/releng/targetplatforms/eclipse/org.eclipse.papyrus.cdo.targetplatform.target
similarity index 100%
rename from plugins/cdo/releng/targetplatforms/eclipse/org.eclipse.papyrus.cdo.targetplatform.target
rename to cdo/releng/targetplatforms/eclipse/org.eclipse.papyrus.cdo.targetplatform.target
diff --git a/plugins/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target
similarity index 100%
rename from plugins/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target
rename to cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target
diff --git a/plugins/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd
similarity index 100%
rename from plugins/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd
rename to cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd
diff --git a/plugins/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/pom.xml b/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/pom.xml
similarity index 100%
rename from plugins/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/pom.xml
rename to cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/pom.xml
diff --git a/plugins/cdo/releng/targetplatforms/pom.xml b/cdo/releng/targetplatforms/pom.xml
similarity index 100%
rename from plugins/cdo/releng/targetplatforms/pom.xml
rename to cdo/releng/targetplatforms/pom.xml
diff --git a/plugins/cdo/releng/toolkit/server/build-after.sh b/cdo/releng/toolkit/server/build-after.sh
similarity index 100%
rename from plugins/cdo/releng/toolkit/server/build-after.sh
rename to cdo/releng/toolkit/server/build-after.sh
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.classpath b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.classpath
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.classpath
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/.classpath
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.project b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.project
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.project
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/.project
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.settings/org.eclipse.jdt.core.prefs b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.settings/org.eclipse.jdt.core.prefs
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.settings/org.eclipse.jdt.ui.prefs b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.settings/org.eclipse.jdt.ui.prefs
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/Papyrus CDO Core Tests.launch b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/Papyrus CDO Core Tests.launch
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/Papyrus CDO Core Tests.launch
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/Papyrus CDO Core Tests.launch
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/about.html b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/about.html
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/about.html
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/about.html
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/build.properties b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/build.properties
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/build.properties
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/build.properties
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/plugin.properties b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/plugin.properties
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/plugin.properties
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/plugin.properties
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/pom.xml b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/pom.xml
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/pom.xml
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/pom.xml
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.di b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.di
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.di
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.di
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.notation b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.notation
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.notation
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.notation
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.uml b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.uml
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.uml
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.uml
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependencies.zip b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependencies.zip
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependencies.zip
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependencies.zip
Binary files differ
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependents.zip b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependents.zip
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependents.zip
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependents.zip
Binary files differ
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/isolated.zip b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/isolated.zip
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/isolated.zip
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/isolated.zip
Binary files differ
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/xmi/A.ecore b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/xmi/A.ecore
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/xmi/A.ecore
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/xmi/A.ecore
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/xmi/B.ecore b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/xmi/B.ecore
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/xmi/B.ecore
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/xmi/B.ecore
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/resource/tests/CDOAwareModelSetTest.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/resource/tests/CDOAwareModelSetTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/resource/tests/CDOAwareModelSetTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/resource/tests/CDOAwareModelSetTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AbstractPapyrusCDOTest.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AbstractPapyrusCDOTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AbstractPapyrusCDOTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AbstractPapyrusCDOTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AllTests.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AllTests.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AllTests.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AllTests.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/ResourceSetFactory.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/ResourceSetFactory.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/ResourceSetFactory.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/ResourceSetFactory.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/TestProject.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/TestProject.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/TestProject.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/TestProject.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/AllUtilTests.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/AllUtilTests.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/AllUtilTests.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/AllUtilTests.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/CDOFunctionsTest.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/CDOFunctionsTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/CDOFunctionsTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/CDOFunctionsTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/CDOPredicatesTest.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/CDOPredicatesTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/CDOPredicatesTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/CDOPredicatesTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/JobWaiterTest.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/JobWaiterTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/JobWaiterTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/JobWaiterTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/controlmode/tests/CDOControlModeTest.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/controlmode/tests/CDOControlModeTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/controlmode/tests/CDOControlModeTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/controlmode/tests/CDOControlModeTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/AbstractModelExportTest.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/AbstractModelExportTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/AbstractModelExportTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/AbstractModelExportTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/AllModelExportTests.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/AllModelExportTests.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/AllModelExportTests.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/AllModelExportTests.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/ModelExportMappingTest.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/ModelExportMappingTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/ModelExportMappingTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/ModelExportMappingTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/ModelExporterTest.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/ModelExporterTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/ModelExporterTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/ModelExporterTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/expressions/tests/AllExpressionsTests.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/expressions/tests/AllExpressionsTests.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/expressions/tests/AllExpressionsTests.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/expressions/tests/AllExpressionsTests.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/expressions/tests/EObjectPropertyTesterTest.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/expressions/tests/EObjectPropertyTesterTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/expressions/tests/EObjectPropertyTesterTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/expressions/tests/EObjectPropertyTesterTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/AllModelImportTests.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/AllModelImportTests.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/AllModelImportTests.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/AllModelImportTests.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ManyToOneModelImportMappingTest.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ManyToOneModelImportMappingTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ManyToOneModelImportMappingTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ManyToOneModelImportMappingTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImportConfigurationTest.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImportConfigurationTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImportConfigurationTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImportConfigurationTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImporterTest.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImporterTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImporterTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImporterTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/OneToOneModelImportMappingTest.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/OneToOneModelImportMappingTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/OneToOneModelImportMappingTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/OneToOneModelImportMappingTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/tests/AllInternalCoreTests.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/tests/AllInternalCoreTests.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/tests/AllInternalCoreTests.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/tests/AllInternalCoreTests.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/tests/CDOUtilsTest.java b/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/tests/CDOUtilsTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/tests/CDOUtilsTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/tests/CDOUtilsTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/.classpath b/cdo/tests/org.eclipse.papyrus.cdo.tests/.classpath
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/.classpath
rename to cdo/tests/org.eclipse.papyrus.cdo.tests/.classpath
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/.project b/cdo/tests/org.eclipse.papyrus.cdo.tests/.project
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/.project
rename to cdo/tests/org.eclipse.papyrus.cdo.tests/.project
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/.settings/org.eclipse.jdt.core.prefs b/cdo/tests/org.eclipse.papyrus.cdo.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/.settings/org.eclipse.jdt.core.prefs
rename to cdo/tests/org.eclipse.papyrus.cdo.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/.settings/org.eclipse.jdt.ui.prefs b/cdo/tests/org.eclipse.papyrus.cdo.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/.settings/org.eclipse.jdt.ui.prefs
rename to cdo/tests/org.eclipse.papyrus.cdo.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/META-INF/MANIFEST.MF b/cdo/tests/org.eclipse.papyrus.cdo.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/META-INF/MANIFEST.MF
rename to cdo/tests/org.eclipse.papyrus.cdo.tests/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/Papyrus All CDO Tests.launch b/cdo/tests/org.eclipse.papyrus.cdo.tests/Papyrus All CDO Tests.launch
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/Papyrus All CDO Tests.launch
rename to cdo/tests/org.eclipse.papyrus.cdo.tests/Papyrus All CDO Tests.launch
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/about.html b/cdo/tests/org.eclipse.papyrus.cdo.tests/about.html
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/about.html
rename to cdo/tests/org.eclipse.papyrus.cdo.tests/about.html
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/build.properties b/cdo/tests/org.eclipse.papyrus.cdo.tests/build.properties
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/build.properties
rename to cdo/tests/org.eclipse.papyrus.cdo.tests/build.properties
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/plugin.properties b/cdo/tests/org.eclipse.papyrus.cdo.tests/plugin.properties
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/plugin.properties
rename to cdo/tests/org.eclipse.papyrus.cdo.tests/plugin.properties
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/pom.xml b/cdo/tests/org.eclipse.papyrus.cdo.tests/pom.xml
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/pom.xml
rename to cdo/tests/org.eclipse.papyrus.cdo.tests/pom.xml
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/src/org/eclipse/papyrus/cdo/tests/AllTests.java b/cdo/tests/org.eclipse.papyrus.cdo.tests/src/org/eclipse/papyrus/cdo/tests/AllTests.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/src/org/eclipse/papyrus/cdo/tests/AllTests.java
rename to cdo/tests/org.eclipse.papyrus.cdo.tests/src/org/eclipse/papyrus/cdo/tests/AllTests.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.classpath b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.classpath
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.classpath
rename to cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.classpath
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.project b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.project
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.project
rename to cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.project
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.settings/org.eclipse.jdt.core.prefs b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.settings/org.eclipse.jdt.core.prefs
rename to cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.settings/org.eclipse.jdt.ui.prefs
rename to cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
rename to cdo/tests/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/Papyrus CDO UI Tests.launch b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/Papyrus CDO UI Tests.launch
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/Papyrus CDO UI Tests.launch
rename to cdo/tests/org.eclipse.papyrus.cdo.ui.tests/Papyrus CDO UI Tests.launch
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/about.html b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/about.html
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/about.html
rename to cdo/tests/org.eclipse.papyrus.cdo.ui.tests/about.html
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/build.properties b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/build.properties
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/build.properties
rename to cdo/tests/org.eclipse.papyrus.cdo.ui.tests/build.properties
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/plugin.properties b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/plugin.properties
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/plugin.properties
rename to cdo/tests/org.eclipse.papyrus.cdo.ui.tests/plugin.properties
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/plugin.xml b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/plugin.xml
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/plugin.xml
rename to cdo/tests/org.eclipse.papyrus.cdo.ui.tests/plugin.xml
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/pom.xml b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/pom.xml
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/pom.xml
rename to cdo/tests/org.eclipse.papyrus.cdo.ui.tests/pom.xml
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.di b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.di
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.di
rename to cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.di
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.notation b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.notation
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.notation
rename to cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.notation
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.uml b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.uml
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.uml
rename to cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.uml
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/editors/tests/BasicEditorTest.java b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/editors/tests/BasicEditorTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/editors/tests/BasicEditorTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/editors/tests/BasicEditorTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/editors/tests/DawnEditorAdapterTest.java b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/editors/tests/DawnEditorAdapterTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/editors/tests/DawnEditorAdapterTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/editors/tests/DawnEditorAdapterTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/markers/tests/CDOPapyrusMarkerTest.java b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/markers/tests/CDOPapyrusMarkerTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/markers/tests/CDOPapyrusMarkerTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/markers/tests/CDOPapyrusMarkerTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/markers/tests/ModelValidationMarkersTest.java b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/markers/tests/ModelValidationMarkersTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/markers/tests/ModelValidationMarkersTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/markers/tests/ModelValidationMarkersTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/views/tests/ItemProviderFilterRegistryTest.java b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/views/tests/ItemProviderFilterRegistryTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/views/tests/ItemProviderFilterRegistryTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/views/tests/ItemProviderFilterRegistryTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AbstractPapyrusCDOUITest.java b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AbstractPapyrusCDOUITest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AbstractPapyrusCDOUITest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AbstractPapyrusCDOUITest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AllTests.java b/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AllTests.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AllTests.java
rename to cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AllTests.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.classpath b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.classpath
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.classpath
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.classpath
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.project b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.project
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.project
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.project
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.settings/org.eclipse.jdt.core.prefs b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.settings/org.eclipse.jdt.core.prefs
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.settings/org.eclipse.jdt.ui.prefs
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/Papyrus CDO Search UI Tests.launch b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/Papyrus CDO Search UI Tests.launch
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/Papyrus CDO Search UI Tests.launch
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/Papyrus CDO Search UI Tests.launch
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/about.html b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/about.html
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/about.html
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/about.html
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/build.properties b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/build.properties
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/build.properties
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/build.properties
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/plugin.properties b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/plugin.properties
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/plugin.properties
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/plugin.properties
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/pom.xml b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/pom.xml
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/pom.xml
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/pom.xml
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.di b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.di
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.di
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.di
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.notation b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.notation
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.notation
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.notation
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.uml b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.uml
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.uml
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.uml
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.di b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.di
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.di
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.di
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.notation b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.notation
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.notation
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.notation
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.uml b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.uml
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.uml
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.uml
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.di b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.di
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.di
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.di
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.notation b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.notation
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.notation
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.notation
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.uml b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.uml
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.uml
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.uml
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.di b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.di
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.di
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.di
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.notation b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.notation
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.notation
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.notation
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.uml b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.uml
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.uml
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.uml
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AbstractPapyrusCDOSearchTest.java b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AbstractPapyrusCDOSearchTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AbstractPapyrusCDOSearchTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AbstractPapyrusCDOSearchTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AdvancedTextSearchTest.java b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AdvancedTextSearchTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AdvancedTextSearchTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AdvancedTextSearchTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AllTests.java b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AllTests.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AllTests.java
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AllTests.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/BasicTextSearchTest.java b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/BasicTextSearchTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/BasicTextSearchTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/BasicTextSearchTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/SearchScopingTest.java b/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/SearchScopingTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/SearchScopingTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/SearchScopingTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.classpath b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.classpath
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.classpath
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.classpath
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.project b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.project
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.project
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.project
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.settings/org.eclipse.jdt.core.prefs b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.settings/org.eclipse.jdt.core.prefs
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.settings/org.eclipse.jdt.ui.prefs
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/META-INF/MANIFEST.MF b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/META-INF/MANIFEST.MF
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/Papyrus CDO UML UI Tests.launch b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/Papyrus CDO UML UI Tests.launch
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/Papyrus CDO UML UI Tests.launch
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/Papyrus CDO UML UI Tests.launch
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/about.html b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/about.html
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/about.html
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/about.html
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/build.properties b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/build.properties
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/build.properties
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/build.properties
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/plugin.properties b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/plugin.properties
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/plugin.properties
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/plugin.properties
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/pom.xml b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/pom.xml
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/pom.xml
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/pom.xml
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/src/org/eclipse/papyrus/cdo/uml/internal/ui/importsources/tests/CDOPackageImportSourceTest.java b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/src/org/eclipse/papyrus/cdo/uml/internal/ui/importsources/tests/CDOPackageImportSourceTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/src/org/eclipse/papyrus/cdo/uml/internal/ui/importsources/tests/CDOPackageImportSourceTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/src/org/eclipse/papyrus/cdo/uml/internal/ui/importsources/tests/CDOPackageImportSourceTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/src/org/eclipse/papyrus/cdo/uml/ui/tests/AllTests.java b/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/src/org/eclipse/papyrus/cdo/uml/ui/tests/AllTests.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/src/org/eclipse/papyrus/cdo/uml/ui/tests/AllTests.java
rename to cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/src/org/eclipse/papyrus/cdo/uml/ui/tests/AllTests.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.classpath b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.classpath
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.classpath
rename to cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.classpath
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.project b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.project
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.project
rename to cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.project
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.settings/org.eclipse.jdt.core.prefs b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.settings/org.eclipse.jdt.core.prefs
rename to cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.settings/org.eclipse.jdt.ui.prefs b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.settings/org.eclipse.jdt.ui.prefs
rename to cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/META-INF/MANIFEST.MF b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/META-INF/MANIFEST.MF
rename to cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/about.html b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/about.html
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/about.html
rename to cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/about.html
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/build.properties b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/build.properties
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/build.properties
rename to cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/build.properties
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/plugin.properties b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/plugin.properties
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/plugin.properties
rename to cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/plugin.properties
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/pom.xml b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/pom.xml
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/pom.xml
rename to cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/pom.xml
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/edit/tests/AllProblemsEditTests.java b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/edit/tests/AllProblemsEditTests.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/edit/tests/AllProblemsEditTests.java
rename to cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/edit/tests/AllProblemsEditTests.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/edit/tests/ProblemEditUtilTest.java b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/edit/tests/ProblemEditUtilTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/edit/tests/ProblemEditUtilTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/edit/tests/ProblemEditUtilTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/AttributeTest.java b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/AttributeTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/AttributeTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/AttributeTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemTest.java b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemsContainerTest.java b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemsContainerTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemsContainerTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemsContainerTest.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsAllTests.java b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsAllTests.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsAllTests.java
rename to cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsAllTests.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsTests.java b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsTests.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsTests.java
rename to cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsTests.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/util/tests/AllUtilTests.java b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/util/tests/AllUtilTests.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/util/tests/AllUtilTests.java
rename to cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/util/tests/AllUtilTests.java
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/util/tests/ProblemsManagerTest.java b/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/util/tests/ProblemsManagerTest.java
similarity index 100%
rename from plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/util/tests/ProblemsManagerTest.java
rename to cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/util/tests/ProblemsManagerTest.java
diff --git a/plugins/cdo/tests/pom.xml b/cdo/tests/pom.xml
similarity index 100%
rename from plugins/cdo/tests/pom.xml
rename to cdo/tests/pom.xml
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.classpath b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.classpath
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.classpath
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.classpath
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.project b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.project
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.project
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.project
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.core.resources.prefs b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.core.resources.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.core.runtime.prefs b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.core.runtime.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.jdt.core.prefs b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.jdt.core.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.jdt.ui.prefs b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.jdt.ui.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.pde.api.tools.prefs b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.pde.api.tools.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/META-INF/MANIFEST.MF b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/META-INF/MANIFEST.MF
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/META-INF/MANIFEST.MF
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/about.html b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/about.html
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/about.html
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/about.html
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/about.ini b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/about.ini
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/about.ini
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/about.ini
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/about.properties b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/about.properties
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/about.properties
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/about.properties
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/build.properties b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/build.properties
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/build.properties
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/build.properties
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/modeling32.png b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/modeling32.png
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/modeling32.png
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/modeling32.png
Binary files differ
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.properties b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.properties
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.properties
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.properties
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.xml b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.xml
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.xml
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.xml
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/pom.xml b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/pom.xml
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/pom.xml
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/pom.xml
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/comparesource/EMFCompareSourceAdapterFactory.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/comparesource/EMFCompareSourceAdapterFactory.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/comparesource/EMFCompareSourceAdapterFactory.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/comparesource/EMFCompareSourceAdapterFactory.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/comparesource/PapyrusFileEMFCompareSourceAdapter.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/comparesource/PapyrusFileEMFCompareSourceAdapter.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/comparesource/PapyrusFileEMFCompareSourceAdapter.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/comparesource/PapyrusFileEMFCompareSourceAdapter.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewer.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewer.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewer.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewer.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewer.properties b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewer.properties
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewer.properties
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewer.properties
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewerCreator.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewerCreator.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewerCreator.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewerCreator.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/FacetUtil.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/FacetUtil.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/FacetUtil.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/FacetUtil.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapper.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapper.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapper.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapper.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapperAdapterFactory.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapperAdapterFactory.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapperAdapterFactory.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapperAdapterFactory.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusCompareAccessorMergeViewerItemProvider.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusCompareAccessorMergeViewerItemProvider.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusCompareAccessorMergeViewerItemProvider.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusCompareAccessorMergeViewerItemProvider.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusContextTester.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusContextTester.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusContextTester.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusContextTester.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusMergeViewerItem.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusMergeViewerItem.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusMergeViewerItem.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusMergeViewerItem.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusMergeViewerItemContentProvider.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusMergeViewerItemContentProvider.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusMergeViewerItemContentProvider.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusMergeViewerItemContentProvider.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusTreeContentMergeViewerItemLabelProvider.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusTreeContentMergeViewerItemLabelProvider.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusTreeContentMergeViewerItemLabelProvider.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusTreeContentMergeViewerItemLabelProvider.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/dependency/PapyrusDependencyProvider.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/dependency/PapyrusDependencyProvider.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/dependency/PapyrusDependencyProvider.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/dependency/PapyrusDependencyProvider.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/AbstractPapyrusResourceSetHook.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/AbstractPapyrusResourceSetHook.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/AbstractPapyrusResourceSetHook.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/AbstractPapyrusResourceSetHook.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CompareDiagramIDEUIPapyrusPlugin.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CompareDiagramIDEUIPapyrusPlugin.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CompareDiagramIDEUIPapyrusPlugin.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CompareDiagramIDEUIPapyrusPlugin.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CompareUIPapyrusMessages.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CompareUIPapyrusMessages.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CompareUIPapyrusMessages.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CompareUIPapyrusMessages.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CssInstallationHook.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CssInstallationHook.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CssInstallationHook.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CssInstallationHook.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/DiagramMigrationHook.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/DiagramMigrationHook.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/DiagramMigrationHook.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/DiagramMigrationHook.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/ElementTypeSetConfigurationRegistryInitializingHook.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/ElementTypeSetConfigurationRegistryInitializingHook.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/ElementTypeSetConfigurationRegistryInitializingHook.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/ElementTypeSetConfigurationRegistryInitializingHook.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/SaveParameterHook.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/SaveParameterHook.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/SaveParameterHook.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/SaveParameterHook.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/ServicesRegistryInitializingHook.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/ServicesRegistryInitializingHook.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/ServicesRegistryInitializingHook.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/ServicesRegistryInitializingHook.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/accessorfactory/PapyrusAccessorFactoryWrapper.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/accessorfactory/PapyrusAccessorFactoryWrapper.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/accessorfactory/PapyrusAccessorFactoryWrapper.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/accessorfactory/PapyrusAccessorFactoryWrapper.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/accessorfactory/PapyrusAccessorWrapper.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/accessorfactory/PapyrusAccessorWrapper.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/accessorfactory/PapyrusAccessorWrapper.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/accessorfactory/PapyrusAccessorWrapper.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/compare_ui_papyrus_messages.properties b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/compare_ui_papyrus_messages.properties
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/compare_ui_papyrus_messages.properties
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/compare_ui_papyrus_messages.properties
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/context/PapyrusContextUtil.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/context/PapyrusContextUtil.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/context/PapyrusContextUtil.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/context/PapyrusContextUtil.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/helper/CompareDiagramViewTypeHelper.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/helper/CompareDiagramViewTypeHelper.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/helper/CompareDiagramViewTypeHelper.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/helper/CompareDiagramViewTypeHelper.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/logical/InternationalizationFileInclusionTester.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/logical/InternationalizationFileInclusionTester.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/logical/InternationalizationFileInclusionTester.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/logical/InternationalizationFileInclusionTester.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/logical/view/PapyrusLMVHandler.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/logical/view/PapyrusLMVHandler.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/logical/view/PapyrusLMVHandler.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/logical/view/PapyrusLMVHandler.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/structuremergeviewer/filters/PapyrusDiagramTechnicalElementsFilter.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/structuremergeviewer/filters/PapyrusDiagramTechnicalElementsFilter.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/structuremergeviewer/filters/PapyrusDiagramTechnicalElementsFilter.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/structuremergeviewer/filters/PapyrusDiagramTechnicalElementsFilter.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/structuremergeviewer/groups/PapyrusGroupProvider.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/structuremergeviewer/groups/PapyrusGroupProvider.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/structuremergeviewer/groups/PapyrusGroupProvider.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/structuremergeviewer/groups/PapyrusGroupProvider.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/util/ModelExtensionUtil.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/util/ModelExtensionUtil.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/util/ModelExtensionUtil.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/util/ModelExtensionUtil.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.classpath b/compare/bundles/org.eclipse.papyrus.compare.diagram/.classpath
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.classpath
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/.classpath
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.project b/compare/bundles/org.eclipse.papyrus.compare.diagram/.project
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.project
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/.project
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.core.resources.prefs b/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.core.resources.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.core.runtime.prefs b/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.core.runtime.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.jdt.core.prefs b/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.jdt.core.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.jdt.ui.prefs b/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.jdt.ui.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.pde.api.tools.prefs b/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.pde.api.tools.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/META-INF/MANIFEST.MF b/compare/bundles/org.eclipse.papyrus.compare.diagram/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/META-INF/MANIFEST.MF
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/META-INF/MANIFEST.MF
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/about.html b/compare/bundles/org.eclipse.papyrus.compare.diagram/about.html
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/about.html
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/about.html
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/build.properties b/compare/bundles/org.eclipse.papyrus.compare.diagram/build.properties
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/build.properties
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/build.properties
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/plugin.properties b/compare/bundles/org.eclipse.papyrus.compare.diagram/plugin.properties
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/plugin.properties
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/plugin.properties
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/plugin.xml b/compare/bundles/org.eclipse.papyrus.compare.diagram/plugin.xml
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/plugin.xml
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/plugin.xml
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/pom.xml b/compare/bundles/org.eclipse.papyrus.compare.diagram/pom.xml
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/pom.xml
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/pom.xml
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/ComparePapyrusMessages.java b/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/ComparePapyrusMessages.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/ComparePapyrusMessages.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/ComparePapyrusMessages.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/compare_papyrus_messages.properties b/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/compare_papyrus_messages.properties
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/compare_papyrus_messages.properties
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/compare_papyrus_messages.properties
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/AbstractPapyrusDiagramDiffHandler.java b/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/AbstractPapyrusDiagramDiffHandler.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/AbstractPapyrusDiagramDiffHandler.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/AbstractPapyrusDiagramDiffHandler.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/CompareDiagramPapyrusPlugin.java b/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/CompareDiagramPapyrusPlugin.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/CompareDiagramPapyrusPlugin.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/CompareDiagramPapyrusPlugin.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/DiffIndexer.java b/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/DiffIndexer.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/DiffIndexer.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/DiffIndexer.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/FeatureInstance.java b/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/FeatureInstance.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/FeatureInstance.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/FeatureInstance.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/IDiffHandler.java b/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/IDiffHandler.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/IDiffHandler.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/IDiffHandler.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/IgnoreDiFilePostProcessor.java b/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/IgnoreDiFilePostProcessor.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/IgnoreDiFilePostProcessor.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/IgnoreDiFilePostProcessor.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagram2WayDiffHandler.java b/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagram2WayDiffHandler.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagram2WayDiffHandler.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagram2WayDiffHandler.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagram3WayDiffHandler.java b/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagram3WayDiffHandler.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagram3WayDiffHandler.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagram3WayDiffHandler.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagramPostComparison.java b/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagramPostComparison.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagramPostComparison.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagramPostComparison.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagramPostProcessor.java b/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagramPostProcessor.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagramPostProcessor.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagramPostProcessor.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusResourceChangeParticipant.java b/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusResourceChangeParticipant.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusResourceChangeParticipant.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusResourceChangeParticipant.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/SidedEObject.java b/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/SidedEObject.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/SidedEObject.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/SidedEObject.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/SidedFeatureInstance.java b/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/SidedFeatureInstance.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/SidedFeatureInstance.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/SidedFeatureInstance.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/util/ModelExtensionUtil.java b/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/util/ModelExtensionUtil.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/util/ModelExtensionUtil.java
rename to compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/util/ModelExtensionUtil.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.classpath b/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.classpath
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.classpath
rename to compare/bundles/org.eclipse.papyrus.compare.egit.ui/.classpath
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.project b/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.project
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.project
rename to compare/bundles/org.eclipse.papyrus.compare.egit.ui/.project
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.core.resources.prefs b/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.core.resources.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.core.runtime.prefs b/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.core.runtime.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.jdt.core.prefs b/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.jdt.core.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.jdt.ui.prefs b/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.jdt.ui.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.m2e.core.prefs b/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.m2e.core.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.m2e.core.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.pde.api.tools.prefs b/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.pde.api.tools.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.egit.ui/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/META-INF/MANIFEST.MF b/compare/bundles/org.eclipse.papyrus.compare.egit.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/META-INF/MANIFEST.MF
rename to compare/bundles/org.eclipse.papyrus.compare.egit.ui/META-INF/MANIFEST.MF
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/build.properties b/compare/bundles/org.eclipse.papyrus.compare.egit.ui/build.properties
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/build.properties
rename to compare/bundles/org.eclipse.papyrus.compare.egit.ui/build.properties
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/icons/obj16/modelmergetool.png b/compare/bundles/org.eclipse.papyrus.compare.egit.ui/icons/obj16/modelmergetool.png
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/icons/obj16/modelmergetool.png
rename to compare/bundles/org.eclipse.papyrus.compare.egit.ui/icons/obj16/modelmergetool.png
Binary files differ
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/plugin.properties b/compare/bundles/org.eclipse.papyrus.compare.egit.ui/plugin.properties
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/plugin.properties
rename to compare/bundles/org.eclipse.papyrus.compare.egit.ui/plugin.properties
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/plugin.xml b/compare/bundles/org.eclipse.papyrus.compare.egit.ui/plugin.xml
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/plugin.xml
rename to compare/bundles/org.eclipse.papyrus.compare.egit.ui/plugin.xml
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/pom.xml b/compare/bundles/org.eclipse.papyrus.compare.egit.ui/pom.xml
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/pom.xml
rename to compare/bundles/org.eclipse.papyrus.compare.egit.ui/pom.xml
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/src/org/eclipse/papyrus/compare/egit/ui/EgitPapyrusStartup.java b/compare/bundles/org.eclipse.papyrus.compare.egit.ui/src/org/eclipse/papyrus/compare/egit/ui/EgitPapyrusStartup.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.egit.ui/src/org/eclipse/papyrus/compare/egit/ui/EgitPapyrusStartup.java
rename to compare/bundles/org.eclipse.papyrus.compare.egit.ui/src/org/eclipse/papyrus/compare/egit/ui/EgitPapyrusStartup.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.feature/.project b/compare/bundles/org.eclipse.papyrus.compare.feature/.project
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.feature/.project
rename to compare/bundles/org.eclipse.papyrus.compare.feature/.project
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.feature/build.properties b/compare/bundles/org.eclipse.papyrus.compare.feature/build.properties
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.feature/build.properties
rename to compare/bundles/org.eclipse.papyrus.compare.feature/build.properties
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.feature/epl-v10.html b/compare/bundles/org.eclipse.papyrus.compare.feature/epl-v10.html
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.feature/epl-v10.html
rename to compare/bundles/org.eclipse.papyrus.compare.feature/epl-v10.html
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.feature/feature.properties b/compare/bundles/org.eclipse.papyrus.compare.feature/feature.properties
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.feature/feature.properties
rename to compare/bundles/org.eclipse.papyrus.compare.feature/feature.properties
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.feature/feature.xml b/compare/bundles/org.eclipse.papyrus.compare.feature/feature.xml
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.feature/feature.xml
rename to compare/bundles/org.eclipse.papyrus.compare.feature/feature.xml
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.feature/license.html b/compare/bundles/org.eclipse.papyrus.compare.feature/license.html
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.feature/license.html
rename to compare/bundles/org.eclipse.papyrus.compare.feature/license.html
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.feature/pom.xml b/compare/bundles/org.eclipse.papyrus.compare.feature/pom.xml
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.feature/pom.xml
rename to compare/bundles/org.eclipse.papyrus.compare.feature/pom.xml
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.classpath b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.classpath
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.classpath
rename to compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.classpath
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.project b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.project
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.project
rename to compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.project
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.core.resources.prefs b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.core.resources.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.core.runtime.prefs b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.core.runtime.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.jdt.core.prefs b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.jdt.core.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.jdt.ui.prefs b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.jdt.ui.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.pde.api.tools.prefs b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.pde.api.tools.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/META-INF/MANIFEST.MF b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/META-INF/MANIFEST.MF
rename to compare/bundles/org.eclipse.papyrus.compare.uml2.edit/META-INF/MANIFEST.MF
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/about.html b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/about.html
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/about.html
rename to compare/bundles/org.eclipse.papyrus.compare.uml2.edit/about.html
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/build.properties b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/build.properties
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/build.properties
rename to compare/bundles/org.eclipse.papyrus.compare.uml2.edit/build.properties
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/plugin.properties b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/plugin.properties
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/plugin.properties
rename to compare/bundles/org.eclipse.papyrus.compare.uml2.edit/plugin.properties
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/plugin.xml b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/plugin.xml
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/plugin.xml
rename to compare/bundles/org.eclipse.papyrus.compare.uml2.edit/plugin.xml
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/pom.xml b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/pom.xml
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/pom.xml
rename to compare/bundles/org.eclipse.papyrus.compare.uml2.edit/pom.xml
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/Activator.java b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/Activator.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/Activator.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/Activator.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/ForwardingItemProviderDecorator.java b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/ForwardingItemProviderDecorator.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/ForwardingItemProviderDecorator.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/ForwardingItemProviderDecorator.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusCompareItemProviderAdapterFactoryDecorator.java b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusCompareItemProviderAdapterFactoryDecorator.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusCompareItemProviderAdapterFactoryDecorator.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusCompareItemProviderAdapterFactoryDecorator.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderAdapterFactoryDecorator.java b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderAdapterFactoryDecorator.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderAdapterFactoryDecorator.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderAdapterFactoryDecorator.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderContextTester.java b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderContextTester.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderContextTester.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderContextTester.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderDecorator.java b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderDecorator.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderDecorator.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderDecorator.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/ResourceRefactoringChangeItemProviderDecorator.java b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/ResourceRefactoringChangeItemProviderDecorator.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/ResourceRefactoringChangeItemProviderDecorator.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/ResourceRefactoringChangeItemProviderDecorator.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.classpath b/compare/bundles/org.eclipse.papyrus.compare.uml2/.classpath
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.classpath
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/.classpath
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.project b/compare/bundles/org.eclipse.papyrus.compare.uml2/.project
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.project
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/.project
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.core.resources.prefs b/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.core.resources.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.core.runtime.prefs b/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.core.runtime.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.jdt.core.prefs b/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.jdt.core.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.jdt.ui.prefs b/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.jdt.ui.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.pde.api.tools.prefs b/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.pde.api.tools.prefs
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/META-INF/MANIFEST.MF b/compare/bundles/org.eclipse.papyrus.compare.uml2/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/META-INF/MANIFEST.MF
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/META-INF/MANIFEST.MF
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/about.html b/compare/bundles/org.eclipse.papyrus.compare.uml2/about.html
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/about.html
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/about.html
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/build.properties b/compare/bundles/org.eclipse.papyrus.compare.uml2/build.properties
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/build.properties
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/build.properties
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/plugin.properties b/compare/bundles/org.eclipse.papyrus.compare.uml2/plugin.properties
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/plugin.properties
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/plugin.properties
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/plugin.xml b/compare/bundles/org.eclipse.papyrus.compare.uml2/plugin.xml
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/plugin.xml
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/plugin.xml
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/pom.xml b/compare/bundles/org.eclipse.papyrus.compare.uml2/pom.xml
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/pom.xml
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/pom.xml
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/UMLPapyrusCompareMessages.java b/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/UMLPapyrusCompareMessages.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/UMLPapyrusCompareMessages.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/UMLPapyrusCompareMessages.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/UMLPapyrusComparePlugin.java b/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/UMLPapyrusComparePlugin.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/UMLPapyrusComparePlugin.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/UMLPapyrusComparePlugin.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/ProfileMigrationHook.java b/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/ProfileMigrationHook.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/ProfileMigrationHook.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/ProfileMigrationHook.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/DelegatingInvocationHandler.java b/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/DelegatingInvocationHandler.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/DelegatingInvocationHandler.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/DelegatingInvocationHandler.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/MissingProfileSupplier.java b/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/MissingProfileSupplier.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/MissingProfileSupplier.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/MissingProfileSupplier.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ModelSetWrapper.java b/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ModelSetWrapper.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ModelSetWrapper.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ModelSetWrapper.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ProfileMigrationDiagnostic.java b/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ProfileMigrationDiagnostic.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ProfileMigrationDiagnostic.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ProfileMigrationDiagnostic.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ProfileNamespaceURIPatternAPI.java b/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ProfileNamespaceURIPatternAPI.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ProfileNamespaceURIPatternAPI.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ProfileNamespaceURIPatternAPI.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/StereotypeApplicationRepair.java b/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/StereotypeApplicationRepair.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/StereotypeApplicationRepair.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/StereotypeApplicationRepair.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/UMLLabelProviderService.java b/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/UMLLabelProviderService.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/UMLLabelProviderService.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/UMLLabelProviderService.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/messages.properties b/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/messages.properties
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/messages.properties
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/messages.properties
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/postprocessor/PapyrusPostProcessor.java b/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/postprocessor/PapyrusPostProcessor.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/postprocessor/PapyrusPostProcessor.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/postprocessor/PapyrusPostProcessor.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/postprocessor/PapyrusResourceIndex.java b/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/postprocessor/PapyrusResourceIndex.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/postprocessor/PapyrusResourceIndex.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/postprocessor/PapyrusResourceIndex.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/postprocessor/ResourceRefactoringChange.java b/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/postprocessor/ResourceRefactoringChange.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/postprocessor/ResourceRefactoringChange.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/postprocessor/ResourceRefactoringChange.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/postprocessor/ResourceRefactoringMerger.java b/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/postprocessor/ResourceRefactoringMerger.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/postprocessor/ResourceRefactoringMerger.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/postprocessor/ResourceRefactoringMerger.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/postprocessor/SidedURI.java b/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/postprocessor/SidedURI.java
similarity index 100%
rename from plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/postprocessor/SidedURI.java
rename to compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/postprocessor/SidedURI.java
diff --git a/plugins/compare/bundles/pom.xml b/compare/bundles/pom.xml
similarity index 100%
rename from plugins/compare/bundles/pom.xml
rename to compare/bundles/pom.xml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.p2/.project b/compare/org.eclipse.papyrus.compare.p2/.project
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.p2/.project
rename to compare/org.eclipse.papyrus.compare.p2/.project
diff --git a/plugins/compare/org.eclipse.papyrus.compare.p2/category.xml b/compare/org.eclipse.papyrus.compare.p2/category.xml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.p2/category.xml
rename to compare/org.eclipse.papyrus.compare.p2/category.xml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.p2/pom.xml b/compare/org.eclipse.papyrus.compare.p2/pom.xml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.p2/pom.xml
rename to compare/org.eclipse.papyrus.compare.p2/pom.xml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.p2/site/template/index.html b/compare/org.eclipse.papyrus.compare.p2/site/template/index.html
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.p2/site/template/index.html
rename to compare/org.eclipse.papyrus.compare.p2/site/template/index.html
diff --git a/plugins/compare/org.eclipse.papyrus.compare.p2/site/template/web/site.css b/compare/org.eclipse.papyrus.compare.p2/site/template/web/site.css
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.p2/site/template/web/site.css
rename to compare/org.eclipse.papyrus.compare.p2/site/template/web/site.css
diff --git a/plugins/compare/pom.xml b/compare/pom.xml
similarity index 100%
rename from plugins/compare/pom.xml
rename to compare/pom.xml
diff --git a/plugins/compare/releng/.project b/compare/releng/.project
similarity index 100%
rename from plugins/compare/releng/.project
rename to compare/releng/.project
diff --git a/plugins/compare/releng/scripts/common.sh b/compare/releng/scripts/common.sh
similarity index 100%
rename from plugins/compare/releng/scripts/common.sh
rename to compare/releng/scripts/common.sh
diff --git a/plugins/compare/releng/scripts/publish-nightly.sh b/compare/releng/scripts/publish-nightly.sh
similarity index 100%
rename from plugins/compare/releng/scripts/publish-nightly.sh
rename to compare/releng/scripts/publish-nightly.sh
diff --git a/plugins/compare/targetplatforms/.project b/compare/targetplatforms/.project
similarity index 100%
rename from plugins/compare/targetplatforms/.project
rename to compare/targetplatforms/.project
diff --git a/plugins/compare/targetplatforms/compare-nightly.target b/compare/targetplatforms/compare-nightly.target
similarity index 100%
rename from plugins/compare/targetplatforms/compare-nightly.target
rename to compare/targetplatforms/compare-nightly.target
diff --git a/plugins/compare/targetplatforms/compare-nightly.tpd b/compare/targetplatforms/compare-nightly.tpd
similarity index 100%
rename from plugins/compare/targetplatforms/compare-nightly.tpd
rename to compare/targetplatforms/compare-nightly.tpd
diff --git a/plugins/compare/targetplatforms/compare-oxygen.target b/compare/targetplatforms/compare-oxygen.target
similarity index 100%
rename from plugins/compare/targetplatforms/compare-oxygen.target
rename to compare/targetplatforms/compare-oxygen.target
diff --git a/plugins/compare/targetplatforms/compare-oxygen.tpd b/compare/targetplatforms/compare-oxygen.tpd
similarity index 100%
rename from plugins/compare/targetplatforms/compare-oxygen.tpd
rename to compare/targetplatforms/compare-oxygen.tpd
diff --git a/plugins/compare/targetplatforms/compare-release.target b/compare/targetplatforms/compare-release.target
similarity index 100%
rename from plugins/compare/targetplatforms/compare-release.target
rename to compare/targetplatforms/compare-release.target
diff --git a/plugins/compare/targetplatforms/compare-release.tpd b/compare/targetplatforms/compare-release.tpd
similarity index 100%
rename from plugins/compare/targetplatforms/compare-release.tpd
rename to compare/targetplatforms/compare-release.tpd
diff --git a/plugins/compare/targetplatforms/compare.tests-nightly.target b/compare/targetplatforms/compare.tests-nightly.target
similarity index 100%
rename from plugins/compare/targetplatforms/compare.tests-nightly.target
rename to compare/targetplatforms/compare.tests-nightly.target
diff --git a/plugins/compare/targetplatforms/compare.tests-nightly.tpd b/compare/targetplatforms/compare.tests-nightly.tpd
similarity index 100%
rename from plugins/compare/targetplatforms/compare.tests-nightly.tpd
rename to compare/targetplatforms/compare.tests-nightly.tpd
diff --git a/plugins/compare/targetplatforms/compare.tests-oxygen.target b/compare/targetplatforms/compare.tests-oxygen.target
similarity index 100%
rename from plugins/compare/targetplatforms/compare.tests-oxygen.target
rename to compare/targetplatforms/compare.tests-oxygen.target
diff --git a/plugins/compare/targetplatforms/compare.tests-oxygen.tpd b/compare/targetplatforms/compare.tests-oxygen.tpd
similarity index 100%
rename from plugins/compare/targetplatforms/compare.tests-oxygen.tpd
rename to compare/targetplatforms/compare.tests-oxygen.tpd
diff --git a/plugins/compare/targetplatforms/compare.tests-release.target b/compare/targetplatforms/compare.tests-release.target
similarity index 100%
rename from plugins/compare/targetplatforms/compare.tests-release.target
rename to compare/targetplatforms/compare.tests-release.target
diff --git a/plugins/compare/targetplatforms/compare.tests-release.tpd b/compare/targetplatforms/compare.tests-release.tpd
similarity index 100%
rename from plugins/compare/targetplatforms/compare.tests-release.tpd
rename to compare/targetplatforms/compare.tests-release.tpd
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.classpath b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.classpath
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.classpath
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.classpath
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.project b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.project
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.project
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.project
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.settings/org.eclipse.jdt.core.prefs b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.settings/org.eclipse.jdt.core.prefs
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.settings/org.eclipse.jdt.ui.prefs b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.settings/org.eclipse.jdt.ui.prefs
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/META-INF/MANIFEST.MF b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/META-INF/MANIFEST.MF
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/META-INF/MANIFEST.MF
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/about.html b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/about.html
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/about.html
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/about.html
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/build.properties b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/build.properties
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/build.properties
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/build.properties
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/fragment.xml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/fragment.xml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/fragment.xml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/fragment.xml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/plugin.properties b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/plugin.properties
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/plugin.properties
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/plugin.properties
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/pom.xml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/pom.xml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/pom.xml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/pom.xml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/AbstractGitTestCase.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/AbstractGitTestCase.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/AbstractGitTestCase.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/AbstractGitTestCase.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/MoveOfDiagramConflictDetectionTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/MoveOfDiagramConflictDetectionTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/MoveOfDiagramConflictDetectionTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/MoveOfDiagramConflictDetectionTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/data/case001.zip b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/data/case001.zip
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/data/case001.zip
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/data/case001.zip
Binary files differ
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/data/case002.zip b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/data/case002.zip
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/data/case002.zip
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/data/case002.zip
Binary files differ
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/AbstractGitMergeTestCase.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/AbstractGitMergeTestCase.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/AbstractGitMergeTestCase.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/AbstractGitMergeTestCase.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/IgnoreDiFileChangesInGitMergeTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/IgnoreDiFileChangesInGitMergeTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/IgnoreDiFileChangesInGitMergeTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/IgnoreDiFileChangesInGitMergeTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeAdd1GitMergeTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeAdd1GitMergeTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeAdd1GitMergeTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeAdd1GitMergeTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeAdd2GitMergeTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeAdd2GitMergeTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeAdd2GitMergeTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeAdd2GitMergeTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeDelete1GitMergeTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeDelete1GitMergeTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeDelete1GitMergeTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeDelete1GitMergeTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeDelete2GitMergeTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeDelete2GitMergeTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeDelete2GitMergeTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeDelete2GitMergeTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeRename1GitMergeTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeRename1GitMergeTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeRename1GitMergeTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeRename1GitMergeTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeRename2GitMergeTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeRename2GitMergeTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeRename2GitMergeTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeRename2GitMergeTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeRename3GitMergeTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeRename3GitMergeTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeRename3GitMergeTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeRename3GitMergeTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeRename4GitMergeTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeRename4GitMergeTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeRename4GitMergeTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeRename4GitMergeTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeRename5GitMergeTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeRename5GitMergeTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeRename5GitMergeTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeRename5GitMergeTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/StereotypeApplicationsInSubunitsTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/StereotypeApplicationsInSubunitsTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/StereotypeApplicationsInSubunitsTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/StereotypeApplicationsInSubunitsTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/StereotypeConflictTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/StereotypeConflictTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/StereotypeConflictTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/StereotypeConflictTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/data/bug526932.zip b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/data/bug526932.zip
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/data/bug526932.zip
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/data/bug526932.zip
Binary files differ
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/data/ignore-di-file-changes.zip b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/data/ignore-di-file-changes.zip
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/data/ignore-di-file-changes.zip
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/data/ignore-di-file-changes.zip
Binary files differ
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/GitTestRepository.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/GitTestRepository.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/GitTestRepository.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/GitTestRepository.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/MockSystemReader.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/MockSystemReader.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/MockSystemReader.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/MockSystemReader.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/mergeresolution/MergeResolutionManagerTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/mergeresolution/MergeResolutionManagerTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/mergeresolution/MergeResolutionManagerTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/mergeresolution/MergeResolutionManagerTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/AdditiveMergeDiagramTests.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/AdditiveMergeDiagramTests.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/AdditiveMergeDiagramTests.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/AdditiveMergeDiagramTests.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/AdditiveMergeDiagramInputData.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/AdditiveMergeDiagramInputData.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/AdditiveMergeDiagramInputData.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/AdditiveMergeDiagramInputData.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/rac.zip b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/rac.zip
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/rac.zip
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/rac.zip
Binary files differ
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/solvable.zip b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/solvable.zip
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/solvable.zip
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/solvable.zip
Binary files differ
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/unsolvable.zip b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/unsolvable.zip
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/unsolvable.zip
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/unsolvable.zip
Binary files differ
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/AttachmentChangeImplicationTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/AttachmentChangeImplicationTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/AttachmentChangeImplicationTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/AttachmentChangeImplicationTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveConflictTests.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveConflictTests.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveConflictTests.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveConflictTests.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveNoConflictTests.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveNoConflictTests.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveNoConflictTests.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveNoConflictTests.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveOrderTests.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveOrderTests.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveOrderTests.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveOrderTests.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/resourceAttachmentChangeMoveNoConflict.zip b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/resourceAttachmentChangeMoveNoConflict.zip
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/resourceAttachmentChangeMoveNoConflict.zip
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/resourceAttachmentChangeMoveNoConflict.zip
Binary files differ
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/suite/PapyrusGitTests.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/suite/PapyrusGitTests.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/suite/PapyrusGitTests.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/suite/PapyrusGitTests.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/unrelated-file.txt b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/unrelated-file.txt
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/unrelated-file.txt
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/unrelated-file.txt
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/unrelated-file.txt b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/unrelated-file.txt
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/unrelated-file.txt
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/unrelated-file.txt
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/Package1.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/Package1.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/Package1.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/Package1.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/Package1.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/Package1.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/Package1.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/Package1.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/Package1.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/Package1.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/Package1.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/Package1.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/left/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/Package1.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/Package1.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/Package1.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/Package1.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/Package1.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/Package1.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/Package1.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/Package1.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/Package1.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/Package1.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/Package1.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/Package1.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/origin/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/Subunit1.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/Subunit1.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/Subunit1.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/Subunit1.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/Subunit1.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/Subunit1.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/Subunit1.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/Subunit1.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/Subunit1.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/Subunit1.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/Subunit1.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/Subunit1.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename1/right/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/left/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/left/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/left/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/left/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/left/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/left/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/left/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/left/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/left/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/left/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/left/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/left/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/Package1.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/Package1.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/Package1.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/Package1.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/Package1.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/Package1.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/Package1.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/Package1.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/Package1.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/Package1.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/Package1.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/Package1.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/origin/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/Subunit1.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/Subunit1.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/Subunit1.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/Subunit1.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/Subunit1.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/Subunit1.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/Subunit1.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/Subunit1.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/Subunit1.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/Subunit1.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/Subunit1.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/Subunit1.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename2/right/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/Package1.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/Package1.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/Package1.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/Package1.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/Package1.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/Package1.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/Package1.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/Package1.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/Package1.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/Package1.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/Package1.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/Package1.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/left/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/Package1.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/Package1.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/Package1.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/Package1.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/Package1.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/Package1.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/Package1.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/Package1.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/Package1.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/Package1.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/Package1.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/Package1.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/origin/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/Subunit1.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/Subunit1.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/Subunit1.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/Subunit1.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/Subunit1.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/Subunit1.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/Subunit1.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/Subunit1.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/Subunit1.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/Subunit1.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/Subunit1.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/Subunit1.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename3/right/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/Package1.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/Package1.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/Package1.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/Package1.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/Package1.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/Package1.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/Package1.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/Package1.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/Package1.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/Package1.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/Package1.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/Package1.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/left/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/Package1.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/Package1.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/Package1.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/Package1.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/Package1.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/Package1.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/Package1.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/Package1.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/Package1.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/Package1.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/Package1.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/Package1.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/origin/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/Subunit1.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/Subunit1.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/Subunit1.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/Subunit1.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/Subunit1.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/Subunit1.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/Subunit1.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/Subunit1.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/Subunit1.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/Subunit1.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/Subunit1.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/Subunit1.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename4/right/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/NewName.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/NewName.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/NewName.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/NewName.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/NewName.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/NewName.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/NewName.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/NewName.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/NewName.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/NewName.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/NewName.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/NewName.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/left/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/Package1.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/Package1.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/Package1.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/Package1.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/Package1.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/Package1.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/Package1.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/Package1.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/Package1.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/Package1.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/Package1.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/Package1.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/origin/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/Subunit1.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/Subunit1.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/Subunit1.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/Subunit1.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/Subunit1.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/Subunit1.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/Subunit1.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/Subunit1.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/Subunit1.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/Subunit1.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/Subunit1.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/Subunit1.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/rename5/right/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.classpath b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.classpath
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.classpath
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/.classpath
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.project b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.project
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.project
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/.project
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.core.resources.prefs b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.core.resources.prefs
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.core.runtime.prefs b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.core.runtime.prefs
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.jdt.core.prefs b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.jdt.core.prefs
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.jdt.ui.prefs b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.jdt.ui.prefs
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/META-INF/MANIFEST.MF b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/META-INF/MANIFEST.MF
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/META-INF/MANIFEST.MF
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/build.properties b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/build.properties
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/build.properties
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/build.properties
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/expectedResultWithUMLRefineElement.nodes b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/expectedResultWithUMLRefineElement.nodes
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/expectedResultWithUMLRefineElement.nodes
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/expectedResultWithUMLRefineElement.nodes
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/plugin.properties b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/plugin.properties
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/plugin.properties
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/plugin.properties
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/pom.xml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/pom.xml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/pom.xml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/pom.xml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/AbstractTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/AbstractTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/AbstractTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/AbstractTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/DiagramInputData.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/DiagramInputData.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/DiagramInputData.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/DiagramInputData.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/DiagramInputDataWithResourceSetHooks.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/DiagramInputDataWithResourceSetHooks.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/DiagramInputDataWithResourceSetHooks.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/DiagramInputDataWithResourceSetHooks.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/DiagramTooltipProviderTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/DiagramTooltipProviderTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/DiagramTooltipProviderTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/DiagramTooltipProviderTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/DiagramTooltipProviderInputData.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/DiagramTooltipProviderInputData.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/DiagramTooltipProviderInputData.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/DiagramTooltipProviderInputData.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/PapyrusContextUtilInputData.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/PapyrusContextUtilInputData.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/PapyrusContextUtilInputData.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/PapyrusContextUtilInputData.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/PapyrusContextUtilTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/PapyrusContextUtilTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/PapyrusContextUtilTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/PapyrusContextUtilTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/ecore/left.ecore b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/ecore/left.ecore
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/ecore/left.ecore
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/ecore/left.ecore
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/ecore/right.ecore b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/ecore/right.ecore
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/ecore/right.ecore
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/ecore/right.ecore
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/CSSTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/CSSTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/CSSTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/CSSTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/CSSInputData.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/CSSInputData.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/CSSInputData.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/CSSInputData.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/css/data/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/IgnoreDiFilePostProcessorTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/IgnoreDiFilePostProcessorTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/IgnoreDiFilePostProcessorTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/IgnoreDiFilePostProcessorTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/left/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/left/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/left/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/left/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/origin/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/origin/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/origin/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/origin/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/right/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/right/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/right/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/right/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/PapyrusConflictsGroupProviderTests.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/PapyrusConflictsGroupProviderTests.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/PapyrusConflictsGroupProviderTests.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/PapyrusConflictsGroupProviderTests.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/PapyrusDifferencesOrderTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/PapyrusDifferencesOrderTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/PapyrusDifferencesOrderTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/PapyrusDifferencesOrderTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/expectedResult_DiagRefineOff.nodes b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/expectedResult_DiagRefineOff.nodes
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/expectedResult_DiagRefineOff.nodes
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/expectedResult_DiagRefineOff.nodes
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/expectedResult_DiagRefineOn.nodes b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/expectedResult_DiagRefineOn.nodes
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/expectedResult_DiagRefineOn.nodes
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/expectedResult_DiagRefineOn.nodes
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/ConflictsGroupInputData.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/ConflictsGroupInputData.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/ConflictsGroupInputData.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/ConflictsGroupInputData.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/AssocMergeTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/AssocMergeTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/AssocMergeTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/AssocMergeTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/EdgeMergeTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/EdgeMergeTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/EdgeMergeTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/EdgeMergeTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/NodeMergeTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/NodeMergeTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/NodeMergeTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/NodeMergeTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/AssocMergeInputData.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/AssocMergeInputData.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/AssocMergeInputData.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/AssocMergeInputData.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/EdgeMergeInputData.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/EdgeMergeInputData.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/EdgeMergeInputData.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/EdgeMergeInputData.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/NodeMergeInputData.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/NodeMergeInputData.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/NodeMergeInputData.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/NodeMergeInputData.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/package-info.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/package-info.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/package-info.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/package-info.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/package-info.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/package-info.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/package-info.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/package-info.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/package-info.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/package-info.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/package-info.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/package-info.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/package-info.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/package-info.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/package-info.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/package-info.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/package-info.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/package-info.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/package-info.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/package-info.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/package-info.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/package-info.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/package-info.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/package-info.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/package-info.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/package-info.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/package-info.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/package-info.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/DiffInvolvingRefineDiffInputData.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/DiffInvolvingRefineDiffInputData.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/DiffInvolvingRefineDiffInputData.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/DiffInvolvingRefineDiffInputData.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/MergeDiffInvolvingRefineDiffTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/MergeDiffInvolvingRefineDiffTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/MergeDiffInvolvingRefineDiffTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/MergeDiffInvolvingRefineDiffTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/migration/DiagramMigrationHookIntegrationTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/migration/DiagramMigrationHookIntegrationTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/migration/DiagramMigrationHookIntegrationTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/migration/DiagramMigrationHookIntegrationTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/migration/DiagramMigrationHookTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/migration/DiagramMigrationHookTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/migration/DiagramMigrationHookTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/migration/DiagramMigrationHookTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/migration/data/a1/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/migration/data/a1/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/migration/data/a1/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/migration/data/a1/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/migration/data/a1/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/migration/data/a1/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/migration/data/a1/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/migration/data/a1/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/migration/data/a1/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/migration/data/a1/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/migration/data/a1/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/migration/data/a1/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/ModelExtensionUtilTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/ModelExtensionUtilTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/ModelExtensionUtilTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/ModelExtensionUtilTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/customparametermodel/CustomParameterModel.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/customparametermodel/CustomParameterModel.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/customparametermodel/CustomParameterModel.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/customparametermodel/CustomParameterModel.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/customparametermodel/customparametermodel.xml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/customparametermodel/customparametermodel.xml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/customparametermodel/customparametermodel.xml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/customparametermodel/customparametermodel.xml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/fileextension/fileextension.xml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/fileextension/fileextension.xml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/fileextension/fileextension.xml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/fileextension/fileextension.xml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/noparametermodel/NoParameterModel.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/noparametermodel/NoParameterModel.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/noparametermodel/NoParameterModel.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/noparametermodel/NoParameterModel.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/noparametermodel/noparametermodel.xml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/noparametermodel/noparametermodel.xml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/noparametermodel/noparametermodel.xml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/noparametermodel/noparametermodel.xml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nulldata/nullextension.xml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nulldata/nullextension.xml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nulldata/nullextension.xml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nulldata/nullextension.xml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullmodel/nullmodel.xml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullmodel/nullmodel.xml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullmodel/nullmodel.xml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullmodel/nullmodel.xml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullparametermodel/NullParameterModel.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullparametermodel/NullParameterModel.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullparametermodel/NullParameterModel.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullparametermodel/NullParameterModel.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullparametermodel/nullparametermodel.xml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullparametermodel/nullparametermodel.xml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullparametermodel/nullparametermodel.xml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullparametermodel/nullparametermodel.xml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/runtimeexceptionmodel/RuntimeExceptionModel.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/runtimeexceptionmodel/RuntimeExceptionModel.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/runtimeexceptionmodel/RuntimeExceptionModel.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/runtimeexceptionmodel/RuntimeExceptionModel.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/runtimeexceptionmodel/runtimeexceptionmodel.xml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/runtimeexceptionmodel/runtimeexceptionmodel.xml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/runtimeexceptionmodel/runtimeexceptionmodel.xml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/runtimeexceptionmodel/runtimeexceptionmodel.xml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/SaveParameterHookIntegrationTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/SaveParameterHookIntegrationTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/SaveParameterHookIntegrationTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/SaveParameterHookIntegrationTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/SaveParameterHookTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/SaveParameterHookTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/SaveParameterHookTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/SaveParameterHookTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a1/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a1/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a1/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a1/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a1/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a1/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a1/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a1/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/MergeNonConflictingCascadingFilterTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/MergeNonConflictingCascadingFilterTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/MergeNonConflictingCascadingFilterTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/MergeNonConflictingCascadingFilterTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/left/left.ecore b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/left/left.ecore
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/left/left.ecore
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/left/left.ecore
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/origin/ancestor.ecore b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/origin/ancestor.ecore
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/origin/ancestor.ecore
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/origin/ancestor.ecore
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/right/right.ecore b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/right/right.ecore
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/right/right.ecore
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/right/right.ecore
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/suite/AllTests.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/suite/AllTests.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/suite/AllTests.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/suite/AllTests.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/URIAttachmentTest.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/URIAttachmentTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/URIAttachmentTest.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/URIAttachmentTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/URIAttachmentData.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/URIAttachmentData.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/URIAttachmentData.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/URIAttachmentData.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.di b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.di
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.di
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.di
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.notation b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.notation
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.notation
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.notation
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.uml
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/util/PapyrusSaveParameterUtil.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/util/PapyrusSaveParameterUtil.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/util/PapyrusSaveParameterUtil.java
rename to compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/util/PapyrusSaveParameterUtil.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.checkstyle b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.checkstyle
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.checkstyle
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/.checkstyle
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.classpath b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.classpath
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.classpath
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/.classpath
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.project b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.project
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.project
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/.project
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.settings/org.eclipse.core.resources.prefs b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.settings/org.eclipse.core.resources.prefs
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.settings/org.eclipse.core.runtime.prefs b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.settings/org.eclipse.core.runtime.prefs
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.settings/org.eclipse.jdt.core.prefs b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.settings/org.eclipse.jdt.core.prefs
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.settings/org.eclipse.jdt.ui.prefs b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.settings/org.eclipse.jdt.ui.prefs
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/META-INF/MANIFEST.MF b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/META-INF/MANIFEST.MF
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/META-INF/MANIFEST.MF
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/about.html b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/about.html
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/about.html
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/about.html
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/build.properties b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/build.properties
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/build.properties
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/build.properties
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/plugin.properties b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/plugin.properties
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/plugin.properties
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/plugin.properties
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/plugin.xml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/plugin.xml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/plugin.xml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/plugin.xml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/pom.xml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/pom.xml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/pom.xml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/pom.xml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/Block.java b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/Block.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/Block.java
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/Block.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/BlocksFactory.java b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/BlocksFactory.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/BlocksFactory.java
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/BlocksFactory.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/BlocksPackage.java b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/BlocksPackage.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/BlocksPackage.java
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/BlocksPackage.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/impl/BlockImpl.java b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/impl/BlockImpl.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/impl/BlockImpl.java
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/impl/BlockImpl.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/impl/BlocksFactoryImpl.java b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/impl/BlocksFactoryImpl.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/impl/BlocksFactoryImpl.java
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/impl/BlocksFactoryImpl.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/impl/BlocksPackageImpl.java b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/impl/BlocksPackageImpl.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/impl/BlocksPackageImpl.java
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/impl/BlocksPackageImpl.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/util/BlocksAdapterFactory.java b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/util/BlocksAdapterFactory.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/util/BlocksAdapterFactory.java
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/util/BlocksAdapterFactory.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/util/BlocksSwitch.java b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/util/BlocksSwitch.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/util/BlocksSwitch.java
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/blocks/util/BlocksSwitch.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/ElementsFactory.java b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/ElementsFactory.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/ElementsFactory.java
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/ElementsFactory.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/ElementsPackage.java b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/ElementsPackage.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/ElementsPackage.java
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/ElementsPackage.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/Viewpoint.java b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/Viewpoint.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/Viewpoint.java
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/Viewpoint.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/impl/ElementsFactoryImpl.java b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/impl/ElementsFactoryImpl.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/impl/ElementsFactoryImpl.java
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/impl/ElementsFactoryImpl.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/impl/ElementsPackageImpl.java b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/impl/ElementsPackageImpl.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/impl/ElementsPackageImpl.java
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/impl/ElementsPackageImpl.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/impl/ViewpointImpl.java b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/impl/ViewpointImpl.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/impl/ViewpointImpl.java
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/impl/ViewpointImpl.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/util/ElementsAdapterFactory.java b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/util/ElementsAdapterFactory.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/util/ElementsAdapterFactory.java
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/util/ElementsAdapterFactory.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/util/ElementsSwitch.java b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/util/ElementsSwitch.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/util/ElementsSwitch.java
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src-gen/org/eclipse/papyrus/compare/uml2/tests/elements/util/ElementsSwitch.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/ModelSetWrapperTest.java b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/ModelSetWrapperTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/ModelSetWrapperTest.java
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/ModelSetWrapperTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/PapyrusMigrationUtil.java b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/PapyrusMigrationUtil.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/PapyrusMigrationUtil.java
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/PapyrusMigrationUtil.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/ProfileMigrationTest.java b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/ProfileMigrationTest.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/ProfileMigrationTest.java
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/ProfileMigrationTest.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/TestResourceReadOnlyHandler.java b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/TestResourceReadOnlyHandler.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/TestResourceReadOnlyHandler.java
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/TestResourceReadOnlyHandler.java
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aab/left.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aab/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aab/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aab/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aab/origin.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aab/origin.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aab/origin.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aab/origin.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aab/right.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aab/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aab/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aab/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aba/left.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aba/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aba/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aba/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aba/origin.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aba/origin.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aba/origin.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aba/origin.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aba/right.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aba/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aba/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/aba/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abb/left.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abb/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abb/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abb/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abb/origin.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abb/origin.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abb/origin.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abb/origin.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abb/right.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abb/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abb/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abb/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abc/left.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abc/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abc/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abc/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abc/origin.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abc/origin.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abc/origin.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abc/origin.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abc/right.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abc/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abc/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/change/abc/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/defaultval/aba/left.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/defaultval/aba/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/defaultval/aba/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/defaultval/aba/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/defaultval/aba/origin.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/defaultval/aba/origin.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/defaultval/aba/origin.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/defaultval/aba/origin.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/defaultval/aba/right.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/defaultval/aba/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/defaultval/aba/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/defaultval/aba/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/unmigrated/aba/left.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/unmigrated/aba/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/unmigrated/aba/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/unmigrated/aba/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/unmigrated/aba/origin.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/unmigrated/aba/origin.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/unmigrated/aba/origin.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/unmigrated/aba/origin.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/unmigrated/aba/right.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/unmigrated/aba/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/unmigrated/aba/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/attribute/unmigrated/aba/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/nodiff/left.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/nodiff/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/nodiff/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/nodiff/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/nodiff/origin.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/nodiff/origin.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/nodiff/origin.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/nodiff/origin.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/nodiff/right.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/nodiff/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/nodiff/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/nodiff/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/aab/left.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/aab/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/aab/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/aab/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/aab/origin.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/aab/origin.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/aab/origin.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/aab/origin.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/aab/right.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/aab/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/aab/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/aab/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/abb/left.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/abb/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/abb/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/abb/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/abb/origin.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/abb/origin.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/abb/origin.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/abb/origin.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/abb/right.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/abb/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/abb/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/notmigrated/abb/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongformat/abb/left.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongformat/abb/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongformat/abb/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongformat/abb/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongformat/abb/origin.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongformat/abb/origin.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongformat/abb/origin.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongformat/abb/origin.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongformat/abb/right.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongformat/abb/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongformat/abb/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongformat/abb/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongmigrated/abb/left.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongmigrated/abb/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongmigrated/abb/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongmigrated/abb/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongmigrated/abb/origin.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongmigrated/abb/origin.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongmigrated/abb/origin.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongmigrated/abb/origin.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongmigrated/abb/right.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongmigrated/abb/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongmigrated/abb/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/uri/wrongmigrated/abb/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/aba/left.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/aba/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/aba/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/aba/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/aba/origin.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/aba/origin.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/aba/origin.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/aba/origin.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/aba/right.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/aba/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/aba/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/aba/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/abb/left.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/abb/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/abb/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/abb/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/abb/origin.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/abb/origin.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/abb/origin.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/abb/origin.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/abb/right.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/abb/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/abb/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/myml/version/abb/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/profile/MyML.profile.genmodel b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/profile/MyML.profile.genmodel
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/profile/MyML.profile.genmodel
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/profile/MyML.profile.genmodel
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/profile/MyML.profile.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/profile/MyML.profile.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/profile/MyML.profile.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/profile/MyML.profile.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/profile/myml.ecore b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/profile/myml.ecore
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/profile/myml.ecore
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/profile/myml.ecore
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/left.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/origin.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/origin.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/origin.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/origin.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/right.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/left.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/left.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/left.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/left.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/origin.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/origin.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/origin.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/origin.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/right.uml b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/right.uml
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/right.uml
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/right.uml
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/suite/AllUITests.java b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/suite/AllUITests.java
similarity index 100%
rename from plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/suite/AllUITests.java
rename to compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/suite/AllUITests.java
diff --git a/plugins/compare/tests/pom.xml b/compare/tests/pom.xml
similarity index 100%
rename from plugins/compare/tests/pom.xml
rename to compare/tests/pom.xml
diff --git a/plugins/pom.xml b/plugins/pom.xml
deleted file mode 100755
index 1010c0e..0000000
--- a/plugins/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- Parent of this POM -->
- <parent>
- <version>0.7.0-SNAPSHOT</version>
- <groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
- <artifactId>org.eclipse.papyrus.collaborativemodeling.root</artifactId>
- </parent>
-
- <!-- Project root POM (aggregator) -->
- <groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
- <artifactId>org.eclipse.papyrus.collaborativemodeling.plugins</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Collaborative Modeling</name>
- <description>Papyrus Collaborative Modeling</description>
-
- <!-- Children modules to build -->
- <modules>
- <module>cdo</module>
- <module>revision</module>
- <module>compare</module>
- </modules>
-
-</project>
diff --git a/pom.xml b/pom.xml
deleted file mode 100755
index e2d45a5..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- Parent of this POM -->
- <parent>
- <version>0.7.0-SNAPSHOT</version>
- <groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
- <artifactId>org.eclipse.papyrus.collaborativemodeling.releng.configuration</artifactId>
- <relativePath>./releng/org.eclipse.papyrus.collaborativemodeling.configuration</relativePath>
- </parent>
-
- <!-- Project root POM (aggregator) -->
- <artifactId>org.eclipse.papyrus.collaborativemodeling.root</artifactId>
- <packaging>pom</packaging>
- <name>Collaborative Modeling</name>
- <description>Papyrus Collaborative Modeling</description>
-
- <!-- Children modules to build -->
- <modules>
- <module>plugins</module>
- <module>releng</module>
- <module>tests</module>
- </modules>
-
-</project>
diff --git a/releng/.project b/releng/.project
deleted file mode 100755
index 9a0ee5b..0000000
--- a/releng/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>Papyrus-CollaborativeModeling_releng</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- </natures>
-</projectDescription>
diff --git a/releng/org.eclipse.papyrus.collaborativemodeling.configuration/.project b/releng/org.eclipse.papyrus.collaborativemodeling.configuration/.project
deleted file mode 100755
index a4c92a4..0000000
--- a/releng/org.eclipse.papyrus.collaborativemodeling.configuration/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.collaborativemodeling.configuration</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- </natures>
-</projectDescription>
diff --git a/releng/org.eclipse.papyrus.collaborativemodeling.configuration/pom.xml b/releng/org.eclipse.papyrus.collaborativemodeling.configuration/pom.xml
deleted file mode 100755
index ff085b9..0000000
--- a/releng/org.eclipse.papyrus.collaborativemodeling.configuration/pom.xml
+++ /dev/null
@@ -1,207 +0,0 @@
-<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>
-
- <!-- Collaborative Modeling depends on generic Papyrus component POM file -->
- <parent>
- <groupId>org.eclipse.papyrus.components</groupId>
- <artifactId>org.eclipse.papyrus.components.parent</artifactId>
- <version>0.0.21</version>
- <relativePath></relativePath>
- </parent>
-
- <!-- Collaborative Modeling root POM: general information -->
- <groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
- <artifactId>org.eclipse.papyrus.collaborativemodeling.releng.configuration</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Collaborative Modeling</name>
- <description>Papyrus Collaborative Modeling</description>
- <inceptionYear>2017</inceptionYear>
-
- <!-- Collaborative Modeling properties -->
- <properties>
- <component.shortname>collaborativemodeling</component.shortname>
- <component.hudson.tabname>Collaborative Modeling</component.hudson.tabname>
- <component.fullartifactId>org.eclipse.papyrus.collaborativemodeling</component.fullartifactId>
- <component.bugzilla.name>Collaborative Modeling</component.bugzilla.name>
- <component.package.rootname>org.eclipse.papyrus.collaborativemodeling</component.package.rootname>
- <component.apibaseline.url>http://download.eclipse.org/modeling/mdt/papyrus/components/collaborativemodeling/</component.apibaseline.url>
- <eclipse.targetrelease>oxygen</eclipse.targetrelease>
- <target.version>0.7.0-SNAPSHOT</target.version>
- <os-jvm-flags/>
- <tycho-version>1.0.0</tycho-version>
- </properties>
-
- <!-- Collaborative Modeling CI system-->
- <ciManagement>
- <system>Hudson</system>
- <url>https://hudson.eclipse.org/papyrus/view/${component.hudson.tabname}/</url>
- </ciManagement>
-
- <!-- Collaborative Modeling Bugzilla -->
- <issueManagement>
- <url>https://bugs.eclipse.org/bugs/buglist.cgi?product=Papyrus&component=${component.bugzilla.name}</url>
- <system>Bugzilla</system>
- </issueManagement>
-
- <distributionManagement>
- <site>
- <id>git.eclipse.org.server</id>
- <url>scm:git:https://git.eclipse.org/gitroot/www.eclipse.org/papyrus/components/${component.shortname}</url>
- </site>
- </distributionManagement>
-
- <scm>
- <url>https://git.eclipse.org/c/papyrus/org.eclipse.papyrus-${component.shortname}.git</url>
- <connection>scm:git:git://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus-${component.shortname}.git</connection>
- </scm>
-
- <!-- Collaborative Modeling Developpers -->
- <developers>
- <developer>
- <name>Patrick Tessier</name>
- <organization>CEA Tech LIST</organization>
- <organizationUrl>http://www-list.cea.fr/</organizationUrl>
- <id>ptessier</id>
- </developer>
- <developer>
- <name>Xavier Zeitoun</name>
- <organization>CEA Tech LIST</organization>
- <organizationUrl>http://www-list.cea.fr/</organizationUrl>
- <id>xzeitoun</id>
- </developer>
- </developers>
-
- <!-- Collaborative Modeling Contributors -->
- <contributors>
- <contributor>
- <name></name>
- </contributor>
- </contributors>
-
- <!-- Location to resolve Papyrus tools -->
- <repositories>
- <repository>
- <id>pap.repo.eclipse.org</id>
- <name>Papyrus Repository - Releases</name>
- <url>https://repo.eclipse.org/content/repositories/papyrus-releases/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>paps.repo.eclipse.org</id>
- <name>Papyrus Repository - Snapshots</name>
- <url>https://repo.eclipse.org/content/repositories/papyrus-snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <!-- Location to find out maven plugins -->
- <pluginRepository>
- <id>org.eclipse.cbi.maven.plugins</id>
- <name>Eclipse CBI</name>
- <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
-
- </pluginRepositories>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- <target>
- <artifact>
- <groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
- <artifactId>org.eclipse.papyrus.collaborativemodeling.targetplatform</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- </artifact>
- </target>
- <argLine>-Xms40m -Xmx1G ${os-jvm-flags}</argLine>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>com.mycila</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <version>3.0.rc1</version>
- <executions>
- <execution>
- <configuration>
- <header>${session.executionRootDirectory}/tests/header/header.epl.txt</header>
- <excludes>
- <exclude>**/MockSystemReader.java</exclude> <!-- has deviating header -->
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>eclipse-sign</id>
- <activation>
- <property>
- <name>Sign</name>
- <value>true</value>
- </property>
- </activation>
- </profile>
- <profile>
- <id>eclipse-pack</id>
- <activation>
- <property>
- <name>!skipPack</name>
- </property>
- </activation>
- </profile>
- <profile>
- <id>macosx-jvm-flags</id>
- <activation>
- <os>
- <family>mac</family>
- </os>
- </activation>
- <properties>
- <os-jvm-flags>-XstartOnFirstThread</os-jvm-flags>
- </properties>
- </profile>
-
- </profiles>
-</project>
diff --git a/releng/org.eclipse.papyrus.collaborativemodeling.p2/.project b/releng/org.eclipse.papyrus.collaborativemodeling.p2/.project
deleted file mode 100755
index bd70cd0..0000000
--- a/releng/org.eclipse.papyrus.collaborativemodeling.p2/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.collaborativemodeling.p2</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.UpdateSiteBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.pde.UpdateSiteNature</nature>
- </natures>
-</projectDescription>
diff --git a/releng/org.eclipse.papyrus.collaborativemodeling.p2/.settings/org.eclipse.core.resources.prefs b/releng/org.eclipse.papyrus.collaborativemodeling.p2/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/releng/org.eclipse.papyrus.collaborativemodeling.p2/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/releng/org.eclipse.papyrus.collaborativemodeling.p2/category.xml b/releng/org.eclipse.papyrus.collaborativemodeling.p2/category.xml
deleted file mode 100755
index b3a7e72..0000000
--- a/releng/org.eclipse.papyrus.collaborativemodeling.p2/category.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <feature url="plugins/cdo/org.eclipse.papyrus.cdo.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.cdo.feature" version="1.2.0.qualifier">
- <category name="org.eclipse.papyrus.collaborativemodeling"/>
- </feature>
- <feature url="plugins/revision/org.eclipse.papyrus.revisiontool.feature_0.7.0.qualifier.jar" id="org.eclipse.papyrus.revisiontool.feature" version="0.7.0.qualifier">
- <category name="org.eclipse.papyrus.collaborativemodeling"/>
- </feature>
- <feature url="features/org.eclipse.papyrus.compare.feature_0.7.0.qualifier.jar" id="org.eclipse.papyrus.compare.feature" version="0.7.0.qualifier">
- <category name="org.eclipse.papyrus.collaborativemodeling"/>
- </feature>
- <category-def name="org.eclipse.papyrus.collaborativemodeling" label="Collaborative Modeling">
- <description>
- Papyrus Tools for Collaborative Modeling
- </description>
- </category-def>
-</site>
diff --git a/releng/org.eclipse.papyrus.collaborativemodeling.p2/pom.xml b/releng/org.eclipse.papyrus.collaborativemodeling.p2/pom.xml
deleted file mode 100755
index e967701..0000000
--- a/releng/org.eclipse.papyrus.collaborativemodeling.p2/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- Parent POM (i.e., the one owned by the releng folder) -->
- <parent>
- <groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
- <artifactId>org.eclipse.papyrus.collaborativemodeling.releng</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- </parent>
-
- <!-- POM description -->
- <artifactId>org.eclipse.papyrus.collaborativemodeling.releng.p2</artifactId>
- <name>Collaborative Modeling update site</name>
- <packaging>eclipse-repository</packaging>
-
-</project>
\ No newline at end of file
diff --git a/releng/pom.xml b/releng/pom.xml
deleted file mode 100755
index bba87a4..0000000
--- a/releng/pom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- Parent of this POM is the Collaborative Modeling project root POM -->
- <parent>
- <groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
- <artifactId>org.eclipse.papyrus.collaborativemodeling.root</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- </parent>
-
- <!-- POM description -->
- <artifactId>org.eclipse.papyrus.collaborativemodeling.releng</artifactId>
- <packaging>pom</packaging>
- <name>Collaborative Modeling Releng</name>
- <description>This plug-in contains the different modules relatives to the releng of Collaborative Modeling.</description>
-
- <!-- Modules to build -->
- <modules>
- <module>org.eclipse.papyrus.collaborativemodeling.p2</module>
- <module>targetplatforms</module>
- </modules>
-
-</project>
\ No newline at end of file
diff --git a/releng/targetplatforms/eclipse/org.eclipse.papyrus.collaborativemodeling.targetplatform.target b/releng/targetplatforms/eclipse/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
deleted file mode 100755
index b938160..0000000
--- a/releng/targetplatforms/eclipse/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Collaborative Modeling Target Platform" sequenceNumber="1531991058">
- <locations>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.sdk.feature.group" version="4.7.3.v20180330-0919"/>
- <repository id="eclipse-oxygen" location="file:/home/data/httpd/download.eclipse.org/releases/oxygen/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="0.0.0"/>
- <repository id="papyrusOxygenN" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.junit.utils" version="0.0.0"/>
- <unit id="org.eclipse.papyrus.junit.framework" version="0.0.0"/>
- <repository id="papyrusOxygenDevN" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="0.0.0"/>
- <repository id="sysml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/sysml14/oxygen"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.compare.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.tests.source.feature.group" version="0.0.0"/>
- <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/latest/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.apache.commons.io" version="0.0.0"/>
- <unit id="org.apache.commons.io.source" version="0.0.0"/>
- <unit id="com.google.inject" version="0.0.0"/>
- <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
- <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
- <unit id="javaewah" version="0.0.0"/>
- <unit id="org.apache.commons.compress" version="0.0.0"/>
- <unit id="org.kohsuke.args4j" version="0.0.0"/>
- <unit id="org.mockito" version="1.9.5.v201605172210"/>
- <unit id="org.hamcrest" version="0.0.0"/>
- <unit id="org.hamcrest.library" version="0.0.0"/>
- <unit id="org.hamcrest.integration" version="0.0.0"/>
- <unit id="org.hamcrest.text" version="0.0.0"/>
- <unit id="org.objenesis" version="1.0.0.v201505121915"/>
- <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.ocl.core.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ocl.examples.classic.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ocl.examples.feature.group" version="0.0.0"/>
- <repository id="ocl" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/ocl/updates/releases/6.3.0"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.cdo.dawn.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.cdo.dawn.feature.group" version="0.0.0"/>
- <repository id="cdo" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/cdo/drops/R20170614-0227"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.mwe.sdk.feature.group" version="0.0.0"/>
- <repository id="mwe2" location="file:/home/data/httpd/download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.1/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.xsd.sdk.feature.group" version="0.0.0"/>
- <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/updates/2.13/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.egit.feature.group" version="4.9.2.201712150930-r"/>
- <unit id="org.eclipse.jgit.feature.group" version="4.9.2.201712150930-r"/>
- <repository id="EGit" location="file:/home/data/httpd/download.eclipse.org/egit/updates-4.9.2"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.xwt" version="1.3.1.I20171018-2059"/>
- <repository id="xwt" location="file:/home/data/httpd/download.eclipse.org/xwt/updates/"/>
- </location>
- </locations>
-</target>
diff --git a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
deleted file mode 100755
index 51f37a5..0000000
--- a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Collaborative Modeling Target Platform" sequenceNumber="1531991058">
- <locations>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.sdk.feature.group" version="4.7.3.v20180330-0919"/>
- <repository id="eclipse-oxygen" location="http://download.eclipse.org/releases/oxygen/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="0.0.0"/>
- <repository id="papyrusOxygenN" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.junit.utils" version="0.0.0"/>
- <unit id="org.eclipse.papyrus.junit.framework" version="0.0.0"/>
- <repository id="papyrusOxygenDevN" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="0.0.0"/>
- <repository id="sysml" location="http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/oxygen"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.compare.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.tests.source.feature.group" version="0.0.0"/>
- <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/latest/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.apache.commons.io" version="0.0.0"/>
- <unit id="org.apache.commons.io.source" version="0.0.0"/>
- <unit id="com.google.inject" version="0.0.0"/>
- <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
- <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
- <unit id="javaewah" version="0.0.0"/>
- <unit id="org.apache.commons.compress" version="0.0.0"/>
- <unit id="org.kohsuke.args4j" version="0.0.0"/>
- <unit id="org.mockito" version="1.9.5.v201605172210"/>
- <unit id="org.hamcrest" version="0.0.0"/>
- <unit id="org.hamcrest.library" version="0.0.0"/>
- <unit id="org.hamcrest.integration" version="0.0.0"/>
- <unit id="org.hamcrest.text" version="0.0.0"/>
- <unit id="org.objenesis" version="1.0.0.v201505121915"/>
- <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.ocl.core.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ocl.examples.classic.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ocl.examples.feature.group" version="0.0.0"/>
- <repository id="ocl" location="http://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.3.0"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.cdo.dawn.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.cdo.dawn.feature.group" version="0.0.0"/>
- <repository id="cdo" location="http://download.eclipse.org/modeling/emf/cdo/drops/R20170614-0227"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.mwe.sdk.feature.group" version="0.0.0"/>
- <repository id="mwe2" location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.1/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.xsd.sdk.feature.group" version="0.0.0"/>
- <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/updates/2.13/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.egit.feature.group" version="4.9.2.201712150930-r"/>
- <unit id="org.eclipse.jgit.feature.group" version="4.9.2.201712150930-r"/>
- <repository id="EGit" location="http://download.eclipse.org/egit/updates-4.9.2"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.xwt" version="1.3.1.I20171018-2059"/>
- <repository id="xwt" location="http://download.eclipse.org/xwt/updates/"/>
- </location>
- </locations>
-</target>
diff --git a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd
deleted file mode 100755
index ebda011..0000000
--- a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd
+++ /dev/null
@@ -1,94 +0,0 @@
-target "Collaborative Modeling Target Platform"
-
-location "http://download.eclipse.org/releases/oxygen/" eclipse-oxygen {
- org.eclipse.sdk.feature.group
-}
-
-/** Manual dependencies */
-
-//manualUpdate
-location papyrusOxygenN "http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen" {
- org.eclipse.papyrus.sdk.feature.feature.group lazy
- org.eclipse.papyrus.views.properties.toolsmiths lazy
-}
-
-//manualUpdate
-location papyrusOxygenDevN "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/" {
- org.eclipse.papyrus.junit.utils lazy
- org.eclipse.papyrus.junit.framework lazy
-}
-
-//required for Compare test ProfileMigrationTest
-//manualUpdate
-location sysml "http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/oxygen" {
- org.eclipse.papyrus.sysml14.feature.feature.group lazy
-}
-
-//manualUpdate
-location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/latest/" {
- org.eclipse.emf.compare.source.feature.group lazy
- org.eclipse.emf.compare.diagram.gmf.source.feature.group lazy
- org.eclipse.emf.compare.uml2.source.feature.group lazy
- org.eclipse.emf.compare.egit.source.feature.group lazy
- org.eclipse.emf.compare.ide.ui.source.feature.group lazy
- org.eclipse.emf.compare.rcp.ui.source.feature.group lazy
- org.eclipse.emf.compare.tests.source.feature.group lazy
-}
-
-//manualUpdate
-with requirements
-location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository" {
- org.apache.commons.io lazy
- org.apache.commons.io.source lazy
- com.google.inject lazy
- com.google.guava [21.0.0,22.0.0)
- com.google.guava.source [21.0.0,22.0.0)
- /* Egit/Jgit */
- javaewah lazy
- org.apache.commons.compress lazy
- org.kohsuke.args4j lazy
- org.mockito [1.9.0,2.0.0)
- org.hamcrest lazy
- org.hamcrest.library lazy
- org.hamcrest.integration lazy
- org.hamcrest.text lazy
- org.objenesis [1.0.0,2.0.0)
-}
-
-/** Automatic dependencies */
-
-//updateFrom("Eclipse OCL 6.3",0)
-location ocl "http://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.3.0" {
- org.eclipse.ocl.core.sdk.feature.group lazy
- org.eclipse.ocl.examples.classic.feature.group lazy
- org.eclipse.ocl.examples.feature.group lazy
-}
-
-//updateFrom("EMF CDO",0)
-location cdo "http://download.eclipse.org/modeling/emf/cdo/drops/R20170614-0227" {
- org.eclipse.emf.cdo.sdk.feature.group lazy
- org.eclipse.emf.cdo.dawn.sdk.feature.group lazy
- org.eclipse.emf.cdo.dawn.feature.group lazy
-}
-
-//updateFrom("EMFT MWE",0)
-location mwe2 "http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.1/"{
- org.eclipse.emf.mwe.sdk.feature.group lazy
-}
-
-//updateFrom("EMF (Core)",0)
-location emf "http://download.eclipse.org/modeling/emf/emf/updates/2.13/" {
- org.eclipse.emf.sdk.feature.group lazy
- org.eclipse.xsd.sdk.feature.group lazy
-}
-
-//updateFrom("EGit", 0)
-location "http://download.eclipse.org/egit/updates-4.9.2" EGit {
- org.eclipse.egit.feature.group [4.9.0,6.0.0)
- org.eclipse.jgit.feature.group [4.9.0,6.0.0)
-}
-
-//updateFrom("XWT", 0)
-location xwt "http://download.eclipse.org/xwt/updates/" {
- org.eclipse.xwt [1.3.1,2.0.0)
-}
\ No newline at end of file
diff --git a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/pom.xml b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/pom.xml
deleted file mode 100755
index e2ed5f7..0000000
--- a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- Parent POM (i.e., the one owned by the releng folder) -->
- <parent>
- <groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
- <artifactId>org.eclipse.papyrus.collaborativemodeling.releng.targetplatforms</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- </parent>
-
- <!-- POM description -->
- <artifactId>org.eclipse.papyrus.collaborativemodeling.targetplatform</artifactId>
- <packaging>eclipse-target-definition</packaging>
- <name>Collaborative Modeling Oxygen Target Platform</name>
-
-</project>
\ No newline at end of file
diff --git a/releng/targetplatforms/pom.xml b/releng/targetplatforms/pom.xml
deleted file mode 100755
index 5756d11..0000000
--- a/releng/targetplatforms/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
- <artifactId>org.eclipse.papyrus.collaborativemodeling.releng</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- </parent>
- <artifactId>org.eclipse.papyrus.collaborativemodeling.releng.targetplatforms</artifactId>
- <packaging>pom</packaging>
- <name>Collaborative Modeling Target Platforms</name>
- <description>This module contains the different target platform definitions</description>
- <profiles>
- <profile>
- <id>oxygen</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <property>
- <name>eclipse.release</name>
- <value>oxygen</value>
- </property>
- </activation>
- <modules>
- <module>org.eclipse.papyrus.collaborativemodeling.targetplatform</module>
- </modules>
- </profile>
- </profiles>
-
-</project>
\ No newline at end of file
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/.classpath b/revision/bundles/org.eclipse.papyrus.revisiontool/.classpath
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/.classpath
rename to revision/bundles/org.eclipse.papyrus.revisiontool/.classpath
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/.project b/revision/bundles/org.eclipse.papyrus.revisiontool/.project
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/.project
rename to revision/bundles/org.eclipse.papyrus.revisiontool/.project
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/.settings/org.eclipse.jdt.core.prefs b/revision/bundles/org.eclipse.papyrus.revisiontool/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/.settings/org.eclipse.jdt.core.prefs
rename to revision/bundles/org.eclipse.papyrus.revisiontool/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/META-INF/MANIFEST.MF b/revision/bundles/org.eclipse.papyrus.revisiontool/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/META-INF/MANIFEST.MF
rename to revision/bundles/org.eclipse.papyrus.revisiontool/META-INF/MANIFEST.MF
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/about.html b/revision/bundles/org.eclipse.papyrus.revisiontool/about.html
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/about.html
rename to revision/bundles/org.eclipse.papyrus.revisiontool/about.html
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/build.properties b/revision/bundles/org.eclipse.papyrus.revisiontool/build.properties
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/build.properties
rename to revision/bundles/org.eclipse.papyrus.revisiontool/build.properties
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc.html b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc.html
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc.html
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc.html
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/colorschememapping.xml b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/colorschememapping.xml
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/colorschememapping.xml
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/colorschememapping.xml
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/filelist.xml b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/filelist.xml
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/filelist.xml
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/filelist.xml
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/themedata.thmx b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/themedata.thmx
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/themedata.thmx
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/themedata.thmx
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/default.css b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/default.css
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/default.css
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/default.css
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/AddReview_screen.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/AddReview_screen.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/AddReview_screen.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/AddReview_screen.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Add_A_review_diagram.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Add_A_review_diagram.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Add_A_review_diagram.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Add_A_review_diagram.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/AddaReview.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/AddaReview.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/AddaReview.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/AddaReview.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Architecture_Overview.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Architecture_Overview.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Architecture_Overview.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Architecture_Overview.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClaseEditors.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClaseEditors.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClaseEditors.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClaseEditors.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClassDiagram.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClassDiagram.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClassDiagram.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClassDiagram.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClassDiagram_about_dialog_package.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClassDiagram_about_dialog_package.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClassDiagram_about_dialog_package.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClassDiagram_about_dialog_package.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_advice_package.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_advice_package.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_advice_package.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_advice_package.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_the_command_package.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_the_command_package.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_the_command_package.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_the_command_package.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_the_handlers_package.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_the_handlers_package.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_the_handlers_package.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_the_handlers_package.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/CloseEditors.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/CloseEditors.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/CloseEditors.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/CloseEditors.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/CommentManaging_UseCases.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/CommentManaging_UseCases.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/CommentManaging_UseCases.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/CommentManaging_UseCases.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/DeleteReview.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/DeleteReview.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/DeleteReview.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/DeleteReview.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Diagram_class_of_the_core_package.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Diagram_class_of_the_core_package.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Diagram_class_of_the_core_package.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Diagram_class_of_the_core_package.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/GUI_architecture.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/GUI_architecture.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/GUI_architecture.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/GUI_architecture.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/HookElement.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/HookElement.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/HookElement.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/HookElement.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/New_Author.PNG b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/New_Author.PNG
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/New_Author.PNG
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/New_Author.PNG
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/OpenSaveReview.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/OpenSaveReview.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/OpenSaveReview.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/OpenSaveReview.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Overview_of_the_package_architecture.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Overview_of_the_package_architecture.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Overview_of_the_package_architecture.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Overview_of_the_package_architecture.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Papyrus_Model_Versionning_profile_description..png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Papyrus_Model_Versionning_profile_description..png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Papyrus_Model_Versionning_profile_description..png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Papyrus_Model_Versionning_profile_description..png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Plug-ins_architecture_.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Plug-ins_architecture_.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Plug-ins_architecture_.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Plug-ins_architecture_.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ProfileDiagram.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ProfileDiagram.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ProfileDiagram.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ProfileDiagram.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Register_modifications.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Register_modifications.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Register_modifications.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Register_modifications.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Remove_a_Review.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Remove_a_Review.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Remove_a_Review.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Remove_a_Review.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/RespondComment.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/RespondComment.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/RespondComment.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/RespondComment.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ReviewSystem_UseCases.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ReviewSystem_UseCases.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ReviewSystem_UseCases.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ReviewSystem_UseCases.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Review_Element_test.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Review_Element_test.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Review_Element_test.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Review_Element_test.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Review_profile.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Review_profile.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Review_profile.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Review_profile.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Revision_mode_Use_Case.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Revision_mode_Use_Case.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Revision_mode_Use_Case.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Revision_mode_Use_Case.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModifications.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModifications.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModifications.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModifications.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModificationsDiagram.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModificationsDiagram.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModificationsDiagram.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModificationsDiagram.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModificationsModelExplorer.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModificationsModelExplorer.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModificationsModelExplorer.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModificationsModelExplorer.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/See_modifications_in_model_explorer.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/See_modifications_in_model_explorer.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/See_modifications_in_model_explorer.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/See_modifications_in_model_explorer.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Strop_revision_test.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Strop_revision_test.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Strop_revision_test.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Strop_revision_test.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Test_about_load_a_review_model.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Test_about_load_a_review_model.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Test_about_load_a_review_model.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Test_about_load_a_review_model.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/UseCaseDiagram.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/UseCaseDiagram.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/UseCaseDiagram.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/UseCaseDiagram.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/UserIdentity.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/UserIdentity.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/UserIdentity.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/UserIdentity.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/addComment.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/addComment.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/addComment.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/addComment.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/launchRevisionMode.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/launchRevisionMode.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/launchRevisionMode.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/launchRevisionMode.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/modificationInDiagramsTest.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/modificationInDiagramsTest.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/modificationInDiagramsTest.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/modificationInDiagramsTest.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/package_architecture.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/package_architecture.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/package_architecture.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/package_architecture.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/respond_to_a_review_Test.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/respond_to_a_review_Test.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/respond_to_a_review_Test.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/respond_to_a_review_Test.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/testLaunchRevision.png b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/testLaunchRevision.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/testLaunchRevision.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/testLaunchRevision.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.di b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.di
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.di
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.di
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.notation b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.notation
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.notation
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.notation
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.uml b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.uml
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.uml
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.uml
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.di b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.di
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.di
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.di
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.notation b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.notation
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.notation
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.notation
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.uml b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.uml
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.uml
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.uml
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/PapyrusModelVersioning.profile.uml b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/PapyrusModelVersioning.profile.uml
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/PapyrusModelVersioning.profile.uml
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/PapyrusModelVersioning.profile.uml
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/ReviewModel.uml b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/ReviewModel.uml
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/ReviewModel.uml
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/ReviewModel.uml
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/review1.uml b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/review1.uml
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/review1.uml
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/review1.uml
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.di b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.di
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.di
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.di
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.notation b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.notation
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.notation
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.notation
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.uml b/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.uml
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.uml
rename to revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.uml
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/icons/sample.gif b/revision/bundles/org.eclipse.papyrus.revisiontool/icons/sample.gif
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/icons/sample.gif
rename to revision/bundles/org.eclipse.papyrus.revisiontool/icons/sample.gif
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/Add.png b/revision/bundles/org.eclipse.papyrus.revisiontool/img/Add.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/Add.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/img/Add.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/Add.svg b/revision/bundles/org.eclipse.papyrus.revisiontool/img/Add.svg
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/Add.svg
rename to revision/bundles/org.eclipse.papyrus.revisiontool/img/Add.svg
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/CommentIcon.png b/revision/bundles/org.eclipse.papyrus.revisiontool/img/CommentIcon.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/CommentIcon.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/img/CommentIcon.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/CommentIcon.svg b/revision/bundles/org.eclipse.papyrus.revisiontool/img/CommentIcon.svg
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/CommentIcon.svg
rename to revision/bundles/org.eclipse.papyrus.revisiontool/img/CommentIcon.svg
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/Delete.svg b/revision/bundles/org.eclipse.papyrus.revisiontool/img/Delete.svg
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/Delete.svg
rename to revision/bundles/org.eclipse.papyrus.revisiontool/img/Delete.svg
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/accept.JPG b/revision/bundles/org.eclipse.papyrus.revisiontool/img/accept.JPG
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/accept.JPG
rename to revision/bundles/org.eclipse.papyrus.revisiontool/img/accept.JPG
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/delete.png b/revision/bundles/org.eclipse.papyrus.revisiontool/img/delete.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/delete.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/img/delete.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/hook.png b/revision/bundles/org.eclipse.papyrus.revisiontool/img/hook.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/hook.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/img/hook.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/hook.svg b/revision/bundles/org.eclipse.papyrus.revisiontool/img/hook.svg
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/hook.svg
rename to revision/bundles/org.eclipse.papyrus.revisiontool/img/hook.svg
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/load.png b/revision/bundles/org.eclipse.papyrus.revisiontool/img/load.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/load.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/img/load.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/propertyviewContextlink.png b/revision/bundles/org.eclipse.papyrus.revisiontool/img/propertyviewContextlink.png
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/propertyviewContextlink.png
rename to revision/bundles/org.eclipse.papyrus.revisiontool/img/propertyviewContextlink.png
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/refuse.JPG b/revision/bundles/org.eclipse.papyrus.revisiontool/img/refuse.JPG
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/refuse.JPG
rename to revision/bundles/org.eclipse.papyrus.revisiontool/img/refuse.JPG
Binary files differ
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/plugin.properties b/revision/bundles/org.eclipse.papyrus.revisiontool/plugin.properties
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/plugin.properties
rename to revision/bundles/org.eclipse.papyrus.revisiontool/plugin.properties
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/plugin.xml b/revision/bundles/org.eclipse.papyrus.revisiontool/plugin.xml
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/plugin.xml
rename to revision/bundles/org.eclipse.papyrus.revisiontool/plugin.xml
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/pom.xml b/revision/bundles/org.eclipse.papyrus.revisiontool/pom.xml
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/pom.xml
rename to revision/bundles/org.eclipse.papyrus.revisiontool/pom.xml
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/Review.ctx b/revision/bundles/org.eclipse.papyrus.revisiontool/properties/Review.ctx
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/Review.ctx
rename to revision/bundles/org.eclipse.papyrus.revisiontool/properties/Review.ctx
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleAnswer.xwt b/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleAnswer.xwt
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleAnswer.xwt
rename to revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleAnswer.xwt
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleComment.xwt b/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleComment.xwt
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleComment.xwt
rename to revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleComment.xwt
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleQuestion.xwt b/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleQuestion.xwt
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleQuestion.xwt
rename to revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleQuestion.xwt
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReview.xwt b/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReview.xwt
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReview.xwt
rename to revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReview.xwt
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReviewRepository.xwt b/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReviewRepository.xwt
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReviewRepository.xwt
rename to revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReviewRepository.xwt
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleTodo.xwt b/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleTodo.xwt
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleTodo.xwt
rename to revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleTodo.xwt
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleAnswer.xwt b/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleAnswer.xwt
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleAnswer.xwt
rename to revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleAnswer.xwt
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleComment.xwt b/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleComment.xwt
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleComment.xwt
rename to revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleComment.xwt
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleQuestion.xwt b/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleQuestion.xwt
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleQuestion.xwt
rename to revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleQuestion.xwt
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleReview.xwt b/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleReview.xwt
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleReview.xwt
rename to revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleReview.xwt
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleReviewRepository.xwt b/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleReviewRepository.xwt
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleReviewRepository.xwt
rename to revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleReviewRepository.xwt
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleTodo.xwt b/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleTodo.xwt
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleTodo.xwt
rename to revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleTodo.xwt
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Changes.profile.di b/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Changes.profile.di
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Changes.profile.di
rename to revision/bundles/org.eclipse.papyrus.revisiontool/resource/Changes.profile.di
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Changes.profile.notation b/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Changes.profile.notation
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Changes.profile.notation
rename to revision/bundles/org.eclipse.papyrus.revisiontool/resource/Changes.profile.notation
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Changes.profile.uml b/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Changes.profile.uml
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Changes.profile.uml
rename to revision/bundles/org.eclipse.papyrus.revisiontool/resource/Changes.profile.uml
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/PapyrusModelVersioning.profile.uml b/revision/bundles/org.eclipse.papyrus.revisiontool/resource/PapyrusModelVersioning.profile.uml
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/PapyrusModelVersioning.profile.uml
rename to revision/bundles/org.eclipse.papyrus.revisiontool/resource/PapyrusModelVersioning.profile.uml
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Review.profile.di b/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Review.profile.di
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Review.profile.di
rename to revision/bundles/org.eclipse.papyrus.revisiontool/resource/Review.profile.di
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Review.profile.notation b/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Review.profile.notation
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Review.profile.notation
rename to revision/bundles/org.eclipse.papyrus.revisiontool/resource/Review.profile.notation
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Review.profile.uml b/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Review.profile.uml
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Review.profile.uml
rename to revision/bundles/org.eclipse.papyrus.revisiontool/resource/Review.profile.uml
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.di b/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.di
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.di
rename to revision/bundles/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.di
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.notation b/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.notation
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.notation
rename to revision/bundles/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.notation
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.uml b/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.uml
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.uml
rename to revision/bundles/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.uml
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/customizationConfiguration.xmi b/revision/bundles/org.eclipse.papyrus.revisiontool/resource/customizationConfiguration.xmi
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/customizationConfiguration.xmi
rename to revision/bundles/org.eclipse.papyrus.revisiontool/resource/customizationConfiguration.xmi
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/revision.custom b/revision/bundles/org.eclipse.papyrus.revisiontool/resource/revision.custom
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/revision.custom
rename to revision/bundles/org.eclipse.papyrus.revisiontool/resource/revision.custom
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/Activator.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/Activator.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/Activator.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/Activator.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/advice/AdviceRemove.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/advice/AdviceRemove.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/advice/AdviceRemove.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/advice/AdviceRemove.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateDifferenceCommand.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateDifferenceCommand.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateDifferenceCommand.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateDifferenceCommand.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateMatchCommand.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateMatchCommand.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateMatchCommand.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateMatchCommand.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateToDoReviewCommand.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateToDoReviewCommand.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateToDoReviewCommand.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateToDoReviewCommand.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/PreventRemoveCommand.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/PreventRemoveCommand.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/PreventRemoveCommand.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/PreventRemoveCommand.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/AddingDiffListener.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/AddingDiffListener.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/AddingDiffListener.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/AddingDiffListener.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_ReviewStereotype.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_ReviewStereotype.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_ReviewStereotype.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_ReviewStereotype.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_StashChangesStereotype.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_StashChangesStereotype.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_StashChangesStereotype.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_StashChangesStereotype.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_VersioningStereotype.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_VersioningStereotype.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_VersioningStereotype.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_VersioningStereotype.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/RefreshFigureListener.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/RefreshFigureListener.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/RefreshFigureListener.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/RefreshFigureListener.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/ReviewResourceManager.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/ReviewResourceManager.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/ReviewResourceManager.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/ReviewResourceManager.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/dialogs/CreateAuthorDialog.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/dialogs/CreateAuthorDialog.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/dialogs/CreateAuthorDialog.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/dialogs/CreateAuthorDialog.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/dialogs/CreateOrSelectReviewModelDialog.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/dialogs/CreateOrSelectReviewModelDialog.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/dialogs/CreateOrSelectReviewModelDialog.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/dialogs/CreateOrSelectReviewModelDialog.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/AcceptReviewHandler.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/AcceptReviewHandler.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/AcceptReviewHandler.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/AcceptReviewHandler.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/DeleteReviewHandler.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/DeleteReviewHandler.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/DeleteReviewHandler.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/DeleteReviewHandler.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/DisplayStatHandler.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/DisplayStatHandler.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/DisplayStatHandler.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/DisplayStatHandler.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/HookReviewHandler.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/HookReviewHandler.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/HookReviewHandler.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/HookReviewHandler.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/IDMAbstractHandler.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/IDMAbstractHandler.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/IDMAbstractHandler.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/IDMAbstractHandler.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/LaunchRevisionMode.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/LaunchRevisionMode.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/LaunchRevisionMode.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/LaunchRevisionMode.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/RefuseReviewHandler.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/RefuseReviewHandler.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/RefuseReviewHandler.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/RefuseReviewHandler.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/ReviewCreateHandler.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/ReviewCreateHandler.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/ReviewCreateHandler.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/ReviewCreateHandler.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/RevisionAbstractHandler.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/RevisionAbstractHandler.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/RevisionAbstractHandler.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/RevisionAbstractHandler.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/SaveSnapshotRevision.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/SaveSnapshotRevision.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/SaveSnapshotRevision.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/SaveSnapshotRevision.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/ReviewPreferenceInitializer.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/ReviewPreferenceInitializer.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/ReviewPreferenceInitializer.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/ReviewPreferenceInitializer.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/RevisionPreferenceConstants.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/RevisionPreferenceConstants.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/RevisionPreferenceConstants.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/RevisionPreferenceConstants.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/RevisionPreferencePage.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/RevisionPreferencePage.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/RevisionPreferencePage.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/RevisionPreferencePage.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/queries/GetBackgroundColor.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/queries/GetBackgroundColor.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/queries/GetBackgroundColor.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/queries/GetBackgroundColor.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/queries/GetStrike.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/queries/GetStrike.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/queries/GetStrike.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/queries/GetStrike.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/AddingFig.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/AddingFig.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/AddingFig.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/AddingFig.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RemovedFig.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RemovedFig.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RemovedFig.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RemovedFig.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsEditor.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsEditor.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsEditor.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsEditor.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsTreeContentProvider.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsTreeContentProvider.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsTreeContentProvider.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsTreeContentProvider.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsTreeLabelProvider.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsTreeLabelProvider.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsTreeLabelProvider.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsTreeLabelProvider.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RevisonDiagLayer.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RevisonDiagLayer.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RevisonDiagLayer.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RevisonDiagLayer.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/SWTQualitativeInfo.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/SWTQualitativeInfo.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/SWTQualitativeInfo.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/SWTQualitativeInfo.java
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/SetFig.java b/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/SetFig.java
similarity index 100%
rename from plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/SetFig.java
rename to revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/SetFig.java
diff --git a/plugins/revision/bundles/pom.xml b/revision/bundles/pom.xml
similarity index 100%
rename from plugins/revision/bundles/pom.xml
rename to revision/bundles/pom.xml
diff --git a/plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/.project b/revision/features/org.eclipse.papyrus.revisiontool.feature/.project
similarity index 100%
rename from plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/.project
rename to revision/features/org.eclipse.papyrus.revisiontool.feature/.project
diff --git a/plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/build.properties b/revision/features/org.eclipse.papyrus.revisiontool.feature/build.properties
similarity index 100%
rename from plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/build.properties
rename to revision/features/org.eclipse.papyrus.revisiontool.feature/build.properties
diff --git a/plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/epl-v10.html b/revision/features/org.eclipse.papyrus.revisiontool.feature/epl-v10.html
similarity index 100%
rename from plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/epl-v10.html
rename to revision/features/org.eclipse.papyrus.revisiontool.feature/epl-v10.html
diff --git a/plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/feature.properties b/revision/features/org.eclipse.papyrus.revisiontool.feature/feature.properties
similarity index 100%
rename from plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/feature.properties
rename to revision/features/org.eclipse.papyrus.revisiontool.feature/feature.properties
diff --git a/plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/feature.xml b/revision/features/org.eclipse.papyrus.revisiontool.feature/feature.xml
similarity index 100%
rename from plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/feature.xml
rename to revision/features/org.eclipse.papyrus.revisiontool.feature/feature.xml
diff --git a/plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/license.html b/revision/features/org.eclipse.papyrus.revisiontool.feature/license.html
similarity index 100%
rename from plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/license.html
rename to revision/features/org.eclipse.papyrus.revisiontool.feature/license.html
diff --git a/plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/pom.xml b/revision/features/org.eclipse.papyrus.revisiontool.feature/pom.xml
similarity index 100%
rename from plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/pom.xml
rename to revision/features/org.eclipse.papyrus.revisiontool.feature/pom.xml
diff --git a/plugins/revision/features/pom.xml b/revision/features/pom.xml
similarity index 100%
rename from plugins/revision/features/pom.xml
rename to revision/features/pom.xml
diff --git a/plugins/revision/pom.xml b/revision/pom.xml
similarity index 100%
rename from plugins/revision/pom.xml
rename to revision/pom.xml
diff --git a/plugins/revision/releng/org.eclipse.papyrus.revisiontool.p2/.project b/revision/releng/org.eclipse.papyrus.revisiontool.p2/.project
similarity index 100%
rename from plugins/revision/releng/org.eclipse.papyrus.revisiontool.p2/.project
rename to revision/releng/org.eclipse.papyrus.revisiontool.p2/.project
diff --git a/plugins/revision/releng/org.eclipse.papyrus.revisiontool.p2/category.xml b/revision/releng/org.eclipse.papyrus.revisiontool.p2/category.xml
similarity index 100%
rename from plugins/revision/releng/org.eclipse.papyrus.revisiontool.p2/category.xml
rename to revision/releng/org.eclipse.papyrus.revisiontool.p2/category.xml
diff --git a/plugins/revision/releng/org.eclipse.papyrus.revisiontool.p2/pom.xml b/revision/releng/org.eclipse.papyrus.revisiontool.p2/pom.xml
similarity index 100%
rename from plugins/revision/releng/org.eclipse.papyrus.revisiontool.p2/pom.xml
rename to revision/releng/org.eclipse.papyrus.revisiontool.p2/pom.xml
diff --git a/plugins/revision/releng/pom.xml b/revision/releng/pom.xml
similarity index 100%
rename from plugins/revision/releng/pom.xml
rename to revision/releng/pom.xml
diff --git a/plugins/revision/releng/targetplatforms/eclipse/org.eclipse.papyrus.revisiontool.targetplatform.target b/revision/releng/targetplatforms/eclipse/org.eclipse.papyrus.revisiontool.targetplatform.target
similarity index 100%
rename from plugins/revision/releng/targetplatforms/eclipse/org.eclipse.papyrus.revisiontool.targetplatform.target
rename to revision/releng/targetplatforms/eclipse/org.eclipse.papyrus.revisiontool.targetplatform.target
diff --git a/plugins/revision/releng/targetplatforms/org.eclipse.papyrus.revisiontool.targetplatform/org.eclipse.papyrus.revisiontool.targetplatform.target b/revision/releng/targetplatforms/org.eclipse.papyrus.revisiontool.targetplatform/org.eclipse.papyrus.revisiontool.targetplatform.target
similarity index 100%
rename from plugins/revision/releng/targetplatforms/org.eclipse.papyrus.revisiontool.targetplatform/org.eclipse.papyrus.revisiontool.targetplatform.target
rename to revision/releng/targetplatforms/org.eclipse.papyrus.revisiontool.targetplatform/org.eclipse.papyrus.revisiontool.targetplatform.target
diff --git a/plugins/revision/releng/targetplatforms/org.eclipse.papyrus.revisiontool.targetplatform/org.eclipse.papyrus.revisiontool.targetplatform.tpd b/revision/releng/targetplatforms/org.eclipse.papyrus.revisiontool.targetplatform/org.eclipse.papyrus.revisiontool.targetplatform.tpd
similarity index 100%
rename from plugins/revision/releng/targetplatforms/org.eclipse.papyrus.revisiontool.targetplatform/org.eclipse.papyrus.revisiontool.targetplatform.tpd
rename to revision/releng/targetplatforms/org.eclipse.papyrus.revisiontool.targetplatform/org.eclipse.papyrus.revisiontool.targetplatform.tpd
diff --git a/plugins/revision/releng/targetplatforms/org.eclipse.papyrus.revisiontool.targetplatform/pom.xml b/revision/releng/targetplatforms/org.eclipse.papyrus.revisiontool.targetplatform/pom.xml
similarity index 100%
rename from plugins/revision/releng/targetplatforms/org.eclipse.papyrus.revisiontool.targetplatform/pom.xml
rename to revision/releng/targetplatforms/org.eclipse.papyrus.revisiontool.targetplatform/pom.xml
diff --git a/plugins/revision/releng/targetplatforms/pom.xml b/revision/releng/targetplatforms/pom.xml
similarity index 100%
rename from plugins/revision/releng/targetplatforms/pom.xml
rename to revision/releng/targetplatforms/pom.xml
diff --git a/tests/header/README.txt b/tests/header/README.txt
deleted file mode 100755
index 63e5c0d..0000000
--- a/tests/header/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-This file is used by the com.mycila plugin during builds to check if all the contributed classes have the sample header
\ No newline at end of file
diff --git a/tests/header/header.epl.txt b/tests/header/header.epl.txt
deleted file mode 100755
index 68cbfa4..0000000
--- a/tests/header/header.epl.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
\ No newline at end of file
diff --git a/tests/pom.xml b/tests/pom.xml
deleted file mode 100755
index 01a91e1..0000000
--- a/tests/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <!-- Parent POM (i.e., root POM of Requirements project) -->
- <parent>
- <groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
- <artifactId>org.eclipse.papyrus.collaborativemodeling.root</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- </parent>
-
- <!-- POM Description -->
- <artifactId>org.eclipse.papyrus.collaborativemodeling.tests</artifactId>
- <packaging>pom</packaging>
- <name>Requirements Tests (Tests folder)</name>
-
- <!-- Modules to build -->
- <modules>
-
- </modules>
-
-</project>
