[Releng] [Oxygen] Update the build infrastructure of the repository

- Update the root platform and remove unneeded dependencies
- Update the cdo module for standalone build
- Update the revisiontool module for standalone build

Change-Id: Icd256628fd3b209a1123b91c45ee8c1601f161ad
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/.classpath b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/.classpath
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/.classpath
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/.classpath
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/.project b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/.project
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/.project
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/.project
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.core.resources.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.core.resources.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.jdt.core.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.jdt.core.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.jdt.ui.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/about.html b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/about.html
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/about.html
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/about.html
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/build.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/build.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/build.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/build.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/model/repositories.ecore b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/model/repositories.ecore
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/model/repositories.ecore
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/model/repositories.ecore
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/model/repositories.ecorediag b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/model/repositories.ecorediag
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/model/repositories.ecorediag
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/model/repositories.ecorediag
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/model/repositories.genmodel b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/model/repositories.genmodel
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/model/repositories.genmodel
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/model/repositories.genmodel
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/plugin.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/plugin.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/plugin.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/plugin.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/plugin.xml b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/plugin.xml
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/plugin.xml
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/plugin.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/pom.xml b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/pom.xml
new file mode 100755
index 0000000..d51e817
--- /dev/null
+++ b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/pom.xml
@@ -0,0 +1,17 @@
+<?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>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo-bundles</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<!-- Project POM -->
+	<artifactId>org.eclipse.papyrus.cdo.core</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/RepositoriesFactory.java b/plugins/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/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/RepositoriesFactory.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/RepositoriesFactory.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/RepositoriesPackage.java b/plugins/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/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/RepositoriesPackage.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/RepositoriesPackage.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/Repository.java b/plugins/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/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/Repository.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/Repository.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/RepositoryRegistry.java b/plugins/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/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/RepositoryRegistry.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/RepositoryRegistry.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoriesFactoryImpl.java b/plugins/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/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoriesFactoryImpl.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoriesFactoryImpl.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoriesPackageImpl.java b/plugins/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/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoriesPackageImpl.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoriesPackageImpl.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoryImpl.java b/plugins/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/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoryImpl.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoryImpl.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoryRegistryImpl.java b/plugins/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/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoryRegistryImpl.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/impl/RepositoryRegistryImpl.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesAdapterFactory.java b/plugins/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/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesAdapterFactory.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesAdapterFactory.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesResourceFactoryImpl.java b/plugins/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/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesResourceFactoryImpl.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesResourceFactoryImpl.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesResourceImpl.java b/plugins/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/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesResourceImpl.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesResourceImpl.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesSwitch.java b/plugins/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/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesSwitch.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesSwitch.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesXMLProcessor.java b/plugins/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/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesXMLProcessor.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src-gen/org/eclipse/papyrus/cdo/internal/core/repositories/util/RepositoriesXMLProcessor.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/CommitException.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/CommitException.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/CommitException.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/CommitException.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/IResourceSetDisposalApprover.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/IResourceSetDisposalApprover.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/IResourceSetDisposalApprover.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/IResourceSetDisposalApprover.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/IPapyrusRepositoryAdminListener.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/IPapyrusRepositoryAdminListener.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/IPapyrusRepositoryAdminListener.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/IPapyrusRepositoryAdminListener.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/PapyrusRepositoryAdminEvent.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/PapyrusRepositoryAdminEvent.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/PapyrusRepositoryAdminEvent.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/PapyrusRepositoryAdminEvent.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/PapyrusRepositoryAdminManager.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/PapyrusRepositoryAdminManager.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/PapyrusRepositoryAdminManager.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/admin/PapyrusRepositoryAdminManager.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/exporter/IModelExportMapping.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/exporter/IModelExportMapping.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/exporter/IModelExportMapping.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/exporter/IModelExportMapping.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/exporter/IModelExporter.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/exporter/IModelExporter.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/exporter/IModelExporter.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/exporter/IModelExporter.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelDependentsProvider.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelDependentsProvider.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelDependentsProvider.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelDependentsProvider.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelImportMapping.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelImportMapping.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelImportMapping.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelImportMapping.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelImporter.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelImporter.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelImporter.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelImporter.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferConfiguration.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferConfiguration.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferConfiguration.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferConfiguration.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferListener.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferListener.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferListener.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferListener.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferMapping.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferMapping.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferMapping.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferMapping.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferMappingListener.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferMappingListener.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferMappingListener.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferMappingListener.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferNode.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferNode.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferNode.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferNode.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferOperation.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferOperation.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferOperation.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/IModelTransferOperation.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/ModelTransferListenerAdapter.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/ModelTransferListenerAdapter.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/ModelTransferListenerAdapter.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/ModelTransferListenerAdapter.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/ModelTransferMappingListenerAdapter.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/ModelTransferMappingListenerAdapter.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/ModelTransferMappingListenerAdapter.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/importer/ModelTransferMappingListenerAdapter.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareCommandStack.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareCommandStack.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareCommandStack.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareCommandStack.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareModelSet.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareModelSet.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareModelSet.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareModelSet.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareModelSetServiceFactory.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareModelSetServiceFactory.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareModelSetServiceFactory.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareModelSetServiceFactory.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareProxyModificationTrackingAdapter.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareProxyModificationTrackingAdapter.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareProxyModificationTrackingAdapter.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareProxyModificationTrackingAdapter.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareTransactionalEditingDomain.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareTransactionalEditingDomain.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareTransactionalEditingDomain.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareTransactionalEditingDomain.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareTransactionalEditingDomainProvider.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareTransactionalEditingDomainProvider.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareTransactionalEditingDomainProvider.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareTransactionalEditingDomainProvider.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOReadOnlyHandler.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOReadOnlyHandler.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOReadOnlyHandler.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOReadOnlyHandler.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOUndoContext.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOUndoContext.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOUndoContext.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOUndoContext.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/PapyrusCDOResourceFactory.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/PapyrusCDOResourceFactory.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/PapyrusCDOResourceFactory.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/PapyrusCDOResourceFactory.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/PapyrusCDOResourceImpl.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/PapyrusCDOResourceImpl.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/PapyrusCDOResourceImpl.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/PapyrusCDOResourceImpl.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/CDOFunctions.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/CDOFunctions.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/CDOFunctions.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/CDOFunctions.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/CDOPredicates.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/CDOPredicates.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/CDOPredicates.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/CDOPredicates.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/JobWaiter.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/JobWaiter.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/JobWaiter.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/util/JobWaiter.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/Activator.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/Activator.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/Activator.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/Activator.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CDOProxyResolvingResourceSet.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CDOProxyResolvingResourceSet.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CDOProxyResolvingResourceSet.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CDOProxyResolvingResourceSet.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CDOUtils.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CDOUtils.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CDOUtils.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CDOUtils.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CompositeResourceSetDisposalApprover.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CompositeResourceSetDisposalApprover.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CompositeResourceSetDisposalApprover.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/CompositeResourceSetDisposalApprover.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/GMFSafePackageProcessor.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/GMFSafePackageProcessor.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/GMFSafePackageProcessor.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/GMFSafePackageProcessor.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/IRepositoryModelStorage.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/IRepositoryModelStorage.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/IRepositoryModelStorage.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/IRepositoryModelStorage.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/controlmode/CDOControlModeParticipant.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/controlmode/CDOControlModeParticipant.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/controlmode/CDOControlModeParticipant.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/controlmode/CDOControlModeParticipant.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/controlmode/CDOProxyManager.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/controlmode/CDOProxyManager.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/controlmode/CDOProxyManager.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/controlmode/CDOProxyManager.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/CDODIDependentsProvider.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/CDODIDependentsProvider.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/CDODIDependentsProvider.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/CDODIDependentsProvider.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/DefaultModelExportConfigurationFactory.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/DefaultModelExportConfigurationFactory.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/DefaultModelExportConfigurationFactory.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/DefaultModelExportConfigurationFactory.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/DefaultModelExportMappingFactory.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/DefaultModelExportMappingFactory.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/DefaultModelExportMappingFactory.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/DefaultModelExportMappingFactory.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExportMapping.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExportMapping.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExportMapping.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExportMapping.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExporter.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExporter.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExporter.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExporter.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExporterFactory.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExporterFactory.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExporterFactory.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/exporter/ModelExporterFactory.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/expressions/EObjectPropertyTester.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/expressions/EObjectPropertyTester.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/expressions/EObjectPropertyTester.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/expressions/EObjectPropertyTester.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/AbstractModelImportMapping.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/AbstractModelImportMapping.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/AbstractModelImportMapping.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/AbstractModelImportMapping.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/AbstractModelTransferMapping.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/AbstractModelTransferMapping.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/AbstractModelTransferMapping.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/AbstractModelTransferMapping.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/DefaultModelImportConfigurationFactory.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/DefaultModelImportConfigurationFactory.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/DefaultModelImportConfigurationFactory.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/DefaultModelImportConfigurationFactory.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/DependencyAdapter.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/DependencyAdapter.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/DependencyAdapter.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/DependencyAdapter.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ManyToOneModelImportMapping.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ManyToOneModelImportMapping.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ManyToOneModelImportMapping.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ManyToOneModelImportMapping.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ManyToOneModelImportMappingFactory.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ManyToOneModelImportMappingFactory.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ManyToOneModelImportMappingFactory.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ManyToOneModelImportMappingFactory.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelImporter.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelImporter.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelImporter.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelImporter.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelImporterFactory.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelImporterFactory.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelImporterFactory.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelImporterFactory.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelTransferConfiguration.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelTransferConfiguration.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelTransferConfiguration.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelTransferConfiguration.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelTransferNode.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelTransferNode.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelTransferNode.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ModelTransferNode.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/OneToOneModelImportMapping.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/OneToOneModelImportMapping.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/OneToOneModelImportMapping.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/OneToOneModelImportMapping.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/OneToOneModelImportMappingFactory.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/OneToOneModelImportMappingFactory.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/OneToOneModelImportMappingFactory.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/OneToOneModelImportMappingFactory.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ReentrantOperationContext.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ReentrantOperationContext.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ReentrantOperationContext.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/ReentrantOperationContext.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/WorkspaceDIDependentsProvider.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/WorkspaceDIDependentsProvider.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/WorkspaceDIDependentsProvider.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/importer/WorkspaceDIDependentsProvider.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/l10n/Messages.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/l10n/Messages.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/l10n/Messages.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/l10n/Messages.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/l10n/messages.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/l10n/messages.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/l10n/messages.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/l10n/messages.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/resource/CDOSashModelProvider.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/resource/CDOSashModelProvider.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/resource/CDOSashModelProvider.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/resource/CDOSashModelProvider.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/services/localizer/CDOAwareObjectLocalizer.java b/plugins/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/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/services/localizer/CDOAwareObjectLocalizer.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/services/localizer/CDOAwareObjectLocalizer.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/.classpath b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.classpath
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/.classpath
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.classpath
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/.project b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.project
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/.project
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.project
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.core.resources.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.core.resources.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.jdt.core.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.jdt.core.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.jdt.ui.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/about.html b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/about.html
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/about.html
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/about.html
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/build.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/build.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/build.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/build.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.xml b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.xml
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.xml
rename to plugins/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/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/pom.xml
new file mode 100755
index 0000000..a9557dc
--- /dev/null
+++ b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.customization.properties/pom.xml
@@ -0,0 +1,17 @@
+<?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>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo-bundles</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+
+	<!-- Project POM -->
+	<artifactId>org.eclipse.papyrus.cdo.ui.customization.properties</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/Activator.java b/plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/Activator.java
rename to plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/messages/Messages.java b/plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/messages/Messages.java
rename to plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/messages/messages.properties b/plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/messages/messages.properties
rename to plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOContextStorageProvider.java b/plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOContextStorageProvider.java
rename to plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOTextDelegatingResourceFactory.java b/plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOTextDelegatingResourceFactory.java
rename to plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOTextURIHandler.java b/plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/CDOTextURIHandler.java
rename to plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/ClobInputStream.java b/plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/ClobInputStream.java
rename to plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/ClobOutputStream.java b/plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/ClobOutputStream.java
rename to plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/AbstractCDOContextAction.java b/plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/AbstractCDOContextAction.java
rename to plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextCopyAction.java b/plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextCopyAction.java
rename to plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextDeleteAction.java b/plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextDeleteAction.java
rename to plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextEditAction.java b/plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextEditAction.java
rename to plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextStorageActionProvider.java b/plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOContextStorageActionProvider.java
rename to plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOResourceEditorInput.java b/plugins/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/org.eclipse.papyrus.cdo.ui.customization.properties/src/org/eclipse/papyrus/cdo/internal/ui/customization/properties/storage/action/CDOResourceEditorInput.java
rename to plugins/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/org.eclipse.papyrus.cdo.ui.doc/.project b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.project
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/.project
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.project
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.core.resources.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.core.resources.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.ui.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.m2e.core.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.m2e.core.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.m2e.core.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.pde.api.tools.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.pde.api.tools.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/about.html b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/about.html
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/about.html
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/about.html
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/build.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/build.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/build.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/build.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/plugin.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/plugin.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/plugin.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/plugin.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/plugin.xml b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/plugin.xml
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/plugin.xml
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/plugin.xml
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/pom.xml b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/pom.xml
similarity index 86%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/pom.xml
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/pom.xml
index cce937d..b6a0c28 100755
--- a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/pom.xml
+++ b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/pom.xml
@@ -2,14 +2,18 @@
 <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>
-		<artifactId>org.eclipse.papyrus.collaborativemodeling.plugins.cdo</artifactId>
-		<groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
-		<version>0.7.0-SNAPSHOT</version>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo-bundles</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.papyrus.collaborativemodeling.cdo.ui.doc</artifactId>
+
+	<artifactId>org.eclipse.papyrus.cdo.ui.doc</artifactId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
+	
 	<build>
 		<plugins>
 			<plugin>
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.markdown b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.markdown
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.markdown
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.markdown
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/cdo-main-toc.xml b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/cdo-main-toc.xml
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/cdo-main-toc.xml
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/cdo-main-toc.xml
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/start/addrepo.png b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/addrepo.png
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/start/addrepo.png
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/addrepo.png
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start.markdown b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start.markdown
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start.markdown
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start.markdown
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/start/discovery_dialog.png b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/discovery_dialog.png
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/start/discovery_dialog.png
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/discovery_dialog.png
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/start/importmodels.png b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/importmodels.png
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/start/importmodels.png
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/importmodels.png
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/start/modelreposview.png b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/modelreposview.png
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/start/modelreposview.png
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/modelreposview.png
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/start/validation.png b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/validation.png
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/start/validation.png
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/start/validation.png
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.markdown b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.markdown
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.markdown
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/cdo-team.markdown
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/team/conflict.png b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/conflict.png
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/team/conflict.png
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/conflict.png
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/team/locked.png b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/locked.png
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/team/locked.png
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/locked.png
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/team/remotely_locked.png b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/remotely_locked.png
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.doc/resource/team/remotely_locked.png
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.doc/resource/team/remotely_locked.png
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/.classpath b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.classpath
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/.classpath
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.classpath
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/.project b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.project
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/.project
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.project
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.core.resources.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.core.resources.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.jdt.core.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.jdt.core.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.jdt.ui.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/META-INF/MANIFEST.MF b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/META-INF/MANIFEST.MF
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/about.html b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/about.html
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/about.html
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/about.html
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/build.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/build.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/build.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/build.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/icons/full/obj16/document.png b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/icons/full/obj16/document.png
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/icons/full/obj16/document.png
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/icons/full/obj16/document.png
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.xml b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.xml
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.xml
rename to plugins/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/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/pom.xml
new file mode 100755
index 0000000..a3b2573
--- /dev/null
+++ b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/pom.xml
@@ -0,0 +1,17 @@
+<?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>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo-bundles</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+
+	<!-- Project POM -->
+	<artifactId>org.eclipse.papyrus.cdo.ui.hyperlink</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/Activator.java b/plugins/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/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/Activator.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/Activator.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOHyperlinkConstants.java b/plugins/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/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOHyperlinkConstants.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOHyperlinkConstants.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlink.java b/plugins/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/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlink.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlink.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlinkEditorShell.java b/plugins/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/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlinkEditorShell.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlinkEditorShell.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlinkHelper.java b/plugins/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/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlinkHelper.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlinkHelper.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlinkLabelProvider.java b/plugins/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/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlinkLabelProvider.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceHyperlinkLabelProvider.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceURIDropStrategy.java b/plugins/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/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceURIDropStrategy.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CDOResourceURIDropStrategy.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CreateCDOResourceHyperlinkCommand.java b/plugins/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/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CreateCDOResourceHyperlinkCommand.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/CreateCDOResourceHyperlinkCommand.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/Messages.java b/plugins/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/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/Messages.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/Messages.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/messages.properties b/plugins/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/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/messages.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui.hyperlink/src/org/eclipse/papyrus/cdo/internal/ui/hyperlink/messages.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/.classpath b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/.classpath
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/.classpath
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/.classpath
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/.project b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/.project
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/.project
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/.project
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.core.resources.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.core.resources.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.jdt.core.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/about.html b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/about.html
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/about.html
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/about.html
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/build.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/build.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/build.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/build.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/add_repo.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/add_repo.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/add_repo.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/add_repo.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/add_repo.pxm b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/add_repo.pxm
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/add_repo.pxm
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/add_repo.pxm
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/link_editor.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/link_editor.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/link_editor.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ctool16/link_editor.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/connect_co.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/connect_co.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/connect_co.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/connect_co.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/connect_co.pxm b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/connect_co.pxm
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/connect_co.pxm
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/connect_co.pxm
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/disconnect_co.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/disconnect_co.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/disconnect_co.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/dlcl16/disconnect_co.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/connect_co.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/connect_co.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/connect_co.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/connect_co.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/connect_co.pxm b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/connect_co.pxm
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/connect_co.pxm
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/connect_co.pxm
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/disconnect_co.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/disconnect_co.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/disconnect_co.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/disconnect_co.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/newfolder_co.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/newfolder_co.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/newfolder_co.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/elcl16/newfolder_co.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/obj16/papyrus_model.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/papyrus_model.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/obj16/papyrus_model.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/papyrus_model.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_closed.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_closed.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_closed.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_closed.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_closed.pxm b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_closed.pxm
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_closed.pxm
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_closed.pxm
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_open.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_open.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_open.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/obj16/repo_open.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/conflicted.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/conflicted.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/conflicted.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/conflicted.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/dependent.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/dependent.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/dependent.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/dependent.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/dependent.pxm b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/dependent.pxm
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/dependent.pxm
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/dependent.pxm
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/other_locked.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/other_locked.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/other_locked.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/other_locked.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/self_locked.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/self_locked.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/self_locked.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr16/self_locked.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/conflicted.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/conflicted.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/conflicted.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/conflicted.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/conflicted.pxm b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/conflicted.pxm
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/conflicted.pxm
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/conflicted.pxm
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/other_locked.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/other_locked.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/other_locked.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/other_locked.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/other_locked.pxm b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/other_locked.pxm
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/other_locked.pxm
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/other_locked.pxm
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/self_locked.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/self_locked.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/self_locked.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/self_locked.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/self_locked.pxm b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/self_locked.pxm
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/self_locked.pxm
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/ovr24/self_locked.pxm
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/view16/model_repositories.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/view16/model_repositories.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/view16/model_repositories.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/view16/model_repositories.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/view16/model_repositories.pxm b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/view16/model_repositories.pxm
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/view16/model_repositories.pxm
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/view16/model_repositories.pxm
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/wizban/Papyrus_CDO.png b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/wizban/Papyrus_CDO.png
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/wizban/Papyrus_CDO.png
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/wizban/Papyrus_CDO.png
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/wizban/Papyrus_CDO.pxm b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/wizban/Papyrus_CDO.pxm
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/icons/full/wizban/Papyrus_CDO.pxm
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/icons/full/wizban/Papyrus_CDO.pxm
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/model/DND.ecore b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/model/DND.ecore
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/model/DND.ecore
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/model/DND.ecore
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/model/DND.ecorediag b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/model/DND.ecorediag
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/model/DND.ecorediag
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/model/DND.ecorediag
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/plugin.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/plugin.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/plugin.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/plugin.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/plugin.xml b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/plugin.xml
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/plugin.xml
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/plugin.xml
diff --git a/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/pom.xml b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/pom.xml
new file mode 100755
index 0000000..f3fb5c8
--- /dev/null
+++ b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/pom.xml
@@ -0,0 +1,17 @@
+<?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>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo-bundles</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+		
+	<!-- Project POM -->
+	<artifactId>org.eclipse.papyrus.cdo.ui</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/schema/repositoryFilters.exsd b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/schema/repositoryFilters.exsd
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/schema/repositoryFilters.exsd
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/schema/repositoryFilters.exsd
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/Activator.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/Activator.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/Activator.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/Activator.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/SharedImages.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/SharedImages.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/SharedImages.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/SharedImages.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/adapters/CDOAdapterFactory.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/adapters/CDOAdapterFactory.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/adapters/CDOAdapterFactory.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/adapters/CDOAdapterFactory.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/adapters/EditorAdapterFactory.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/adapters/EditorAdapterFactory.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/adapters/EditorAdapterFactory.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/adapters/EditorAdapterFactory.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateAdapter.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateAdapter.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateAdapter.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateAdapter.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateDiagramDecorator.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateDiagramDecorator.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateDiagramDecorator.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateDiagramDecorator.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateLabelDecorator.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateLabelDecorator.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateLabelDecorator.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/CDOStateLabelDecorator.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/DiagramDecoratorProvider.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/DiagramDecoratorProvider.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/DiagramDecoratorProvider.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/DiagramDecoratorProvider.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusConnectionEditPartStylizer.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusConnectionEditPartStylizer.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusConnectionEditPartStylizer.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusConnectionEditPartStylizer.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusEditPartStylizer.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusEditPartStylizer.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusEditPartStylizer.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusEditPartStylizer.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusElementStylizer.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusElementStylizer.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusElementStylizer.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusElementStylizer.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusElementStylizerFactory.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusElementStylizerFactory.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusElementStylizerFactory.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusElementStylizerFactory.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusNodeEditPartStylizer.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusNodeEditPartStylizer.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusNodeEditPartStylizer.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/decorators/PapyrusNodeEditPartStylizer.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CheckoutBrowseDialog.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CheckoutBrowseDialog.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CheckoutBrowseDialog.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CheckoutBrowseDialog.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CheckoutSelectionDialog.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CheckoutSelectionDialog.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CheckoutSelectionDialog.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CheckoutSelectionDialog.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CreateCDOModelFragmentDialog.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CreateCDOModelFragmentDialog.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CreateCDOModelFragmentDialog.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dialogs/CreateCDOModelFragmentDialog.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/CDOResourceURITransferData.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/CDOResourceURITransferData.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/CDOResourceURITransferData.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/CDOResourceURITransferData.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDragAdapter.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDragAdapter.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDragAdapter.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDragAdapter.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropActionDelegate.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropActionDelegate.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropActionDelegate.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropActionDelegate.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropAdapter.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropAdapter.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropAdapter.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropAdapter.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropAdapterAssistant.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropAdapterAssistant.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropAdapterAssistant.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/dnd/ResourceDropAdapterAssistant.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnEditorAdapter.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnEditorAdapter.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnEditorAdapter.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnEditorAdapter.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnGraphicalEditorSupport.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnGraphicalEditorSupport.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnGraphicalEditorSupport.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnGraphicalEditorSupport.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnGraphicalEditorSupportServiceFactory.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnGraphicalEditorSupportServiceFactory.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnGraphicalEditorSupportServiceFactory.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/DawnGraphicalEditorSupportServiceFactory.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorInput.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorInput.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorInput.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorInput.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorManager.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorManager.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorManager.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorManager.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorOpener.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorOpener.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorOpener.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusCDOEditorOpener.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFEditorSupport.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFEditorSupport.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFEditorSupport.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFEditorSupport.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFHandler.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFHandler.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFHandler.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFHandler.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFLockingHandler.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFLockingHandler.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFLockingHandler.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusGMFLockingHandler.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusTransactionListener.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusTransactionListener.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusTransactionListener.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/editors/PapyrusTransactionListener.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/expressions/CDOObjectPropertyTester.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/expressions/CDOObjectPropertyTester.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/expressions/CDOObjectPropertyTester.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/expressions/CDOObjectPropertyTester.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ExportModelHandler.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ExportModelHandler.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ExportModelHandler.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ExportModelHandler.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ImportModelsHandler.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ImportModelsHandler.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ImportModelsHandler.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ImportModelsHandler.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/LockObjectsHandler.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/LockObjectsHandler.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/LockObjectsHandler.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/LockObjectsHandler.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ResolveConflictsHandler.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ResolveConflictsHandler.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ResolveConflictsHandler.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/ResolveConflictsHandler.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/UIHandlerUtil.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/UIHandlerUtil.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/UIHandlerUtil.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/UIHandlerUtil.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/UnlockObjectsHandler.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/UnlockObjectsHandler.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/UnlockObjectsHandler.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/handlers/UnlockObjectsHandler.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/l10n/Messages.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/l10n/Messages.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/l10n/Messages.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/l10n/Messages.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/l10n/messages.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/l10n/messages.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/l10n/messages.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/l10n/messages.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOMarkerMonitor.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOMarkerMonitor.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOMarkerMonitor.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOMarkerMonitor.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOMarkerProvider.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOMarkerProvider.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOMarkerProvider.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOMarkerProvider.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOPapyrusMarker.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOPapyrusMarker.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOPapyrusMarker.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/markers/CDOPapyrusMarker.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/providers/CDOResourceLabelProvider.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/providers/CDOResourceLabelProvider.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/providers/CDOResourceLabelProvider.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/providers/CDOResourceLabelProvider.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/providers/ModelImportNodeLabelProvider.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/providers/ModelImportNodeLabelProvider.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/providers/ModelImportNodeLabelProvider.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/providers/ModelImportNodeLabelProvider.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/CompositeLabelProvider.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/CompositeLabelProvider.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/CompositeLabelProvider.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/CompositeLabelProvider.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/UISafeProgressMonitor.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/UISafeProgressMonitor.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/UISafeProgressMonitor.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/UISafeProgressMonitor.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/UIUtil.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/UIUtil.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/UIUtil.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/util/UIUtil.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/CheckoutItemProvider.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/CheckoutItemProvider.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/CheckoutItemProvider.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/CheckoutItemProvider.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIModel.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIModel.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIModel.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIModel.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIResourceQuery.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIResourceQuery.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIResourceQuery.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/DIResourceQuery.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/ItemProviderFilterRegistry.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/ItemProviderFilterRegistry.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/ItemProviderFilterRegistry.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/views/ItemProviderFilterRegistry.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/widgets/ActionButton.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/widgets/ActionButton.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/widgets/ActionButton.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/widgets/ActionButton.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/CheckoutSelectionBlock.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/CheckoutSelectionBlock.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/CheckoutSelectionBlock.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/CheckoutSelectionBlock.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/CheckoutSelectionPage.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/CheckoutSelectionPage.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/CheckoutSelectionPage.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/CheckoutSelectionPage.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/LocalRepositoryView.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/LocalRepositoryView.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/LocalRepositoryView.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/LocalRepositoryView.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelExportMappingsPage.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelExportMappingsPage.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelExportMappingsPage.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelExportMappingsPage.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelExportWizard.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelExportWizard.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelExportWizard.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelExportWizard.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelImportWizard.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelImportWizard.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelImportWizard.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelImportWizard.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelImportWizardPage.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelImportWizardPage.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelImportWizardPage.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelImportWizardPage.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelMappingsPage.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelMappingsPage.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelMappingsPage.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelMappingsPage.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelReferencesPage.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelReferencesPage.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelReferencesPage.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/ModelReferencesPage.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/WizardOperationContext.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/WizardOperationContext.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/WizardOperationContext.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/wizards/WizardOperationContext.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/.classpath b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.classpath
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/.classpath
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.classpath
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/.project b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.project
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/.project
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.project
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/.settings/org.eclipse.jdt.core.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/about.html b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/about.html
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/about.html
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/about.html
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/build.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/build.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/build.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/build.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/icons/full/elcl16/newmodel_co.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/icons/full/elcl16/newmodel_co.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/icons/full/elcl16/newmodel_co.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/icons/full/elcl16/newmodel_co.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/icons/full/elcl16/newmodel_co.pxm b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/icons/full/elcl16/newmodel_co.pxm
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/icons/full/elcl16/newmodel_co.pxm
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/icons/full/elcl16/newmodel_co.pxm
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.xml b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.xml
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.xml
rename to plugins/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/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/pom.xml
new file mode 100755
index 0000000..1386497
--- /dev/null
+++ b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.diagram.ui/pom.xml
@@ -0,0 +1,17 @@
+<?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>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo-bundles</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+
+	<!-- Project POM -->
+	<artifactId>org.eclipse.papyrus.cdo.uml.diagram.ui</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/Activator.java b/plugins/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/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/Activator.java
rename to plugins/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/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/handlers/NewModelHandler.java b/plugins/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/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/handlers/NewModelHandler.java
rename to plugins/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/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/l10n/Messages.java b/plugins/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/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/l10n/Messages.java
rename to plugins/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/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/l10n/messages.properties b/plugins/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/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/l10n/messages.properties
rename to plugins/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/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/CDONewModelStorageProvider.java b/plugins/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/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/CDONewModelStorageProvider.java
rename to plugins/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/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/NewModelPage.java b/plugins/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/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/NewModelPage.java
rename to plugins/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/org.eclipse.papyrus.cdo.uml.search.ui/.classpath b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.classpath
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/.classpath
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.classpath
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/.project b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.project
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/.project
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.project
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/.settings/org.eclipse.jdt.core.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/about.html b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/about.html
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/about.html
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/about.html
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/build.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/build.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/build.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/build.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/plugin.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/plugin.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/plugin.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/plugin.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/plugin.xml b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/plugin.xml
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/plugin.xml
rename to plugins/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/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/pom.xml
new file mode 100755
index 0000000..6413966
--- /dev/null
+++ b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.search.ui/pom.xml
@@ -0,0 +1,17 @@
+<?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>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo-bundles</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<!-- Project POM -->
+	<artifactId>org.eclipse.papyrus.cdo.uml.search.ui</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/Activator.java b/plugins/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/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/Activator.java
rename to plugins/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/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/open/CDOOpenElementService.java b/plugins/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/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/open/CDOOpenElementService.java
rename to plugins/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/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/AttributeMatchStrategy.java b/plugins/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/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/AttributeMatchStrategy.java
rename to plugins/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/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/CDOPapyrusQuery.java b/plugins/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/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/CDOPapyrusQuery.java
rename to plugins/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/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/CDOSearchQueryProvider.java b/plugins/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/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/CDOSearchQueryProvider.java
rename to plugins/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/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/PatternUtil.java b/plugins/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/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/query/PatternUtil.java
rename to plugins/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/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/scope/CDOScopeProvider.java b/plugins/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/org.eclipse.papyrus.cdo.uml.search.ui/src/org/eclipse/papyrus/cdo/uml/search/internal/ui/scope/CDOScopeProvider.java
rename to plugins/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/org.eclipse.papyrus.cdo.uml.ui/.classpath b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.classpath
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/.classpath
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.classpath
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/.project b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.project
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/.project
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.project
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/.settings/org.eclipse.jdt.core.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/about.html b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/about.html
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/about.html
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/about.html
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/build.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/build.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/build.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/build.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/plugin.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/plugin.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/plugin.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/plugin.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/plugin.xml b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/plugin.xml
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/plugin.xml
rename to plugins/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/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/pom.xml
new file mode 100755
index 0000000..b4fe7e0
--- /dev/null
+++ b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/pom.xml
@@ -0,0 +1,17 @@
+<?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>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo-bundles</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<!-- Project POM -->
+	<artifactId>org.eclipse.papyrus.cdo.uml.ui</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/Activator.java b/plugins/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/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/Activator.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/Activator.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/importsources/CDOPackageImportSource.java b/plugins/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/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/importsources/CDOPackageImportSource.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/importsources/CDOPackageImportSource.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/l10n/Messages.java b/plugins/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/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/l10n/Messages.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/l10n/Messages.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/l10n/messages.properties b/plugins/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/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/l10n/messages.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.uml.ui/src/org/eclipse/papyrus/cdo/uml/internal/ui/l10n/messages.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/.classpath b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.classpath
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/.classpath
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.classpath
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/.project b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.project
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/.project
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.project
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/.settings/org.eclipse.jdt.core.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/.settings/org.eclipse.jdt.ui.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/META-INF/MANIFEST.MF b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/META-INF/MANIFEST.MF
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/about.html b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/about.html
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/about.html
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/about.html
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/build.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/build.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/build.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/build.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblem_attributes_Attribute.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblem_attributes_Attribute.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblem_attributes_Attribute.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblem_attributes_Attribute.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblemsContainer_problems_EProblem.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblemsContainer_problems_EProblem.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblemsContainer_problems_EProblem.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblemsContainer_problems_EProblem.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblemsContainer_subcontainers_EProblemsContainer.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblemsContainer_subcontainers_EProblemsContainer.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblemsContainer_subcontainers_EProblemsContainer.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/ctool16/CreateEProblemsContainer_subcontainers_EProblemsContainer.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/Attribute.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/Attribute.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/Attribute.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/Attribute.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/EProblem.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/EProblem.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/EProblem.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/EProblem.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/EProblemsContainer.gif b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/EProblemsContainer.gif
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/EProblemsContainer.gif
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/icons/full/obj16/EProblemsContainer.gif
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.xml b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.xml
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.xml
rename to plugins/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/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/pom.xml
new file mode 100755
index 0000000..80b1801
--- /dev/null
+++ b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/pom.xml
@@ -0,0 +1,17 @@
+<?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>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo-bundles</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<!-- Project POM -->
+	<artifactId>org.eclipse.papyrus.cdo.validation.problems.edit</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/edit/IProblemTypeProvider.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/edit/IProblemTypeProvider.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/edit/IProblemTypeProvider.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/edit/ProblemEditUtil.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/edit/ProblemEditUtil.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/edit/ProblemEditUtil.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/edit/ProblemTypeItemProviderAdapter.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/edit/ProblemTypeItemProviderAdapter.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/edit/ProblemTypeItemProviderAdapter.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/AttributeItemProvider.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/AttributeItemProvider.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/AttributeItemProvider.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/EProblemItemProvider.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/EProblemItemProvider.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/EProblemItemProvider.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/EProblemsContainerItemProvider.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/EProblemsContainerItemProvider.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/EProblemsContainerItemProvider.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/ProblemsEditPlugin.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/ProblemsEditPlugin.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/ProblemsEditPlugin.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/ProblemsItemProviderAdapterFactory.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/ProblemsItemProviderAdapterFactory.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems.edit/src/org/eclipse/papyrus/cdo/validation/problems/provider/ProblemsItemProviderAdapterFactory.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/.classpath b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.classpath
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/.classpath
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.classpath
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/.project b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.project
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/.project
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.project
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/.settings/org.eclipse.jdt.core.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/.settings/org.eclipse.jdt.core.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/.settings/org.eclipse.jdt.ui.prefs b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/META-INF/CDO.MF b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/META-INF/CDO.MF
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/META-INF/CDO.MF
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/META-INF/CDO.MF
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/META-INF/MANIFEST.MF b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/META-INF/MANIFEST.MF
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/about.html b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/about.html
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/about.html
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/about.html
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/build.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/build.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/build.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/build.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/model/Problems.ecore b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/model/Problems.ecore
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/model/Problems.ecore
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/model/Problems.ecore
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/model/Problems.ecorediag b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/model/Problems.ecorediag
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/model/Problems.ecorediag
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/model/Problems.ecorediag
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/model/Problems.genmodel b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/model/Problems.genmodel
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/model/Problems.genmodel
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/model/Problems.genmodel
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/plugin.properties b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/plugin.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/plugin.properties
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/plugin.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/plugin.xml b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/plugin.xml
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/plugin.xml
rename to plugins/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/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/pom.xml
new file mode 100755
index 0000000..05ab73f
--- /dev/null
+++ b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/pom.xml
@@ -0,0 +1,17 @@
+<?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>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo-bundles</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<!-- Project POM -->
+	<artifactId>org.eclipse.papyrus.cdo.validation.problems</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/EProblem.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/EProblem.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/EProblem.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/EProblem.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/EProblemsContainer.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/EProblemsContainer.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/EProblemsContainer.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/EProblemsContainer.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ESeverity.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ESeverity.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ESeverity.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ESeverity.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ProblemsFactory.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ProblemsFactory.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ProblemsFactory.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ProblemsFactory.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ProblemsPackage.java b/plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ProblemsPackage.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ProblemsPackage.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/ProblemsPackage.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/AttributeImpl.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/AttributeImpl.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/AttributeImpl.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/EProblemImpl.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/EProblemImpl.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/EProblemImpl.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/EProblemsContainerImpl.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/EProblemsContainerImpl.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/EProblemsContainerImpl.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/ProblemsFactoryImpl.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/ProblemsFactoryImpl.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/ProblemsFactoryImpl.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/ProblemsPackageImpl.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/ProblemsPackageImpl.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/impl/ProblemsPackageImpl.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/internal/ProblemsPlugin.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/internal/ProblemsPlugin.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/internal/ProblemsPlugin.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsAdapterFactory.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsAdapterFactory.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsAdapterFactory.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsEvent.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsEvent.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsEvent.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsListener.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsListener.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsListener.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsManager.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsManager.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsManager.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsSwitch.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsSwitch.java
rename to plugins/cdo/bundles/org.eclipse.papyrus.cdo.validation.problems/src/org/eclipse/papyrus/cdo/validation/problems/util/ProblemsSwitch.java
diff --git a/plugins/cdo/bundles/pom.xml b/plugins/cdo/bundles/pom.xml
new file mode 100755
index 0000000..d1e481a
--- /dev/null
+++ b/plugins/cdo/bundles/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<!-- Parent of this POM -->
+	<parent>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo.root</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<!-- Project POM (aggregator) -->
+	<artifactId>org.eclipse.papyrus.cdo-bundles</artifactId>
+	<packaging>pom</packaging>
+
+	<!-- Children modules to build -->
+	<modules>
+		<module>org.eclipse.papyrus.cdo.core</module>
+		<module>org.eclipse.papyrus.cdo.ui</module>
+		<module>org.eclipse.papyrus.cdo.ui.customization.properties</module>
+		<module>org.eclipse.papyrus.cdo.ui.hyperlink</module>
+		<module>org.eclipse.papyrus.cdo.uml.diagram.ui</module>
+		<module>org.eclipse.papyrus.cdo.uml.search.ui</module>
+		<module>org.eclipse.papyrus.cdo.uml.ui</module>
+		<module>org.eclipse.papyrus.cdo.validation.problems</module>
+		<module>org.eclipse.papyrus.cdo.validation.problems.edit</module>
+	</modules>
+	
+</project>
\ No newline at end of file
diff --git a/plugins/cdo/org.eclipse.papyrus.extra.cdo.feature/.project b/plugins/cdo/features/org.eclipse.papyrus.cdo.feature/.project
similarity index 86%
rename from plugins/cdo/org.eclipse.papyrus.extra.cdo.feature/.project
rename to plugins/cdo/features/org.eclipse.papyrus.cdo.feature/.project
index 0e159bd..03a4110 100755
--- a/plugins/cdo/org.eclipse.papyrus.extra.cdo.feature/.project
+++ b/plugins/cdo/features/org.eclipse.papyrus.cdo.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.extra.cdo.feature</name>
+	<name>org.eclipse.papyrus.cdo.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/cdo/org.eclipse.papyrus.extra.cdo.feature/build.properties b/plugins/cdo/features/org.eclipse.papyrus.cdo.feature/build.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.extra.cdo.feature/build.properties
rename to plugins/cdo/features/org.eclipse.papyrus.cdo.feature/build.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.extra.cdo.feature/epl-v10.html b/plugins/cdo/features/org.eclipse.papyrus.cdo.feature/epl-v10.html
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.extra.cdo.feature/epl-v10.html
rename to plugins/cdo/features/org.eclipse.papyrus.cdo.feature/epl-v10.html
diff --git a/plugins/cdo/org.eclipse.papyrus.extra.cdo.feature/feature.properties b/plugins/cdo/features/org.eclipse.papyrus.cdo.feature/feature.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.extra.cdo.feature/feature.properties
rename to plugins/cdo/features/org.eclipse.papyrus.cdo.feature/feature.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.extra.cdo.feature/feature.xml b/plugins/cdo/features/org.eclipse.papyrus.cdo.feature/feature.xml
similarity index 93%
rename from plugins/cdo/org.eclipse.papyrus.extra.cdo.feature/feature.xml
rename to plugins/cdo/features/org.eclipse.papyrus.cdo.feature/feature.xml
index 43f1ba7..3302b84 100755
--- a/plugins/cdo/org.eclipse.papyrus.extra.cdo.feature/feature.xml
+++ b/plugins/cdo/features/org.eclipse.papyrus.cdo.feature/feature.xml
@@ -10,7 +10,7 @@
      Contributors:
      		CEA LIST - Initial API and implementation
  -->
-<feature id="org.eclipse.papyrus.extra.cdo.feature" label="%featureName" provider-name="%providerName" version="1.2.0.qualifier">
+<feature id="org.eclipse.papyrus.cdo.feature" label="%featureName" provider-name="%providerName" version="1.2.0.qualifier">
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
       Copyright (c) 2013 CEA LIST.
diff --git a/plugins/cdo/org.eclipse.papyrus.extra.cdo.feature/license.html b/plugins/cdo/features/org.eclipse.papyrus.cdo.feature/license.html
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.extra.cdo.feature/license.html
rename to plugins/cdo/features/org.eclipse.papyrus.cdo.feature/license.html
diff --git a/plugins/cdo/features/org.eclipse.papyrus.cdo.feature/pom.xml b/plugins/cdo/features/org.eclipse.papyrus.cdo.feature/pom.xml
new file mode 100755
index 0000000..d8fd770
--- /dev/null
+++ b/plugins/cdo/features/org.eclipse.papyrus.cdo.feature/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<!-- Parent of this POM -->
+	<parent>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo-features</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<!-- Project POM -->
+	<artifactId>org.eclipse.papyrus.cdo.feature</artifactId>
+	<groupId>org.eclipse.papyrus</groupId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/plugins/cdo/features/pom.xml b/plugins/cdo/features/pom.xml
new file mode 100755
index 0000000..4b8f7fd
--- /dev/null
+++ b/plugins/cdo/features/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<!-- Parent of this POM -->
+	<parent>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo.root</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+
+	<!-- Project root POM (aggregator) -->
+	<artifactId>org.eclipse.papyrus.cdo-features</artifactId>
+	<packaging>pom</packaging>
+
+	<!-- Children modules to build -->
+	<modules>
+		<module>org.eclipse.papyrus.cdo.feature</module>
+	</modules>
+
+</project>
\ No newline at end of file
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/pom.xml b/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/pom.xml
deleted file mode 100755
index f9224e2..0000000
--- a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2017 CEA LIST.
-   
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-   
-     Contributors:
-     		CEA LIST - Initial API and implementation
- -->
-
-<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.plugins.cdo</artifactId>
-	</parent>
-	
-	<!-- Project POM -->
-  <groupId>org.eclipse.papyrus</groupId>
-  <artifactId>org.eclipse.papyrus.cdo.core.tests</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
-  <packaging>eclipse-test-plugin</packaging>
-</project>
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core/pom.xml b/plugins/cdo/org.eclipse.papyrus.cdo.core/pom.xml
deleted file mode 100755
index 74e12bf..0000000
--- a/plugins/cdo/org.eclipse.papyrus.cdo.core/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2017 CEA LIST.
-   
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-   
-     Contributors:
-     		CEA LIST - Initial API and implementation
- -->
-
-<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.plugins.cdo</artifactId>
-	</parent>
-	
-	<!-- Project POM -->
-	<artifactId>org.eclipse.papyrus.cdo.core</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.tests/pom.xml b/plugins/cdo/org.eclipse.papyrus.cdo.tests/pom.xml
deleted file mode 100755
index 37854ca..0000000
--- a/plugins/cdo/org.eclipse.papyrus.cdo.tests/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2017 CEA LIST.
-   
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-   
-     Contributors:
-     		CEA LIST - Initial API and implementation
- -->
-
-<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.plugins.cdo</artifactId>
-	</parent>
-	
-	<!-- Project POM -->
-  <groupId>org.eclipse.papyrus</groupId>
-  <artifactId>org.eclipse.papyrus.cdo.tests</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
-  <packaging>eclipse-test-plugin</packaging>
-</project>
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/pom.xml b/plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/pom.xml
deleted file mode 100755
index 7040629..0000000
--- a/plugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2017 CEA LIST.
-   
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-   
-     Contributors:
-     		CEA LIST - Initial API and implementation
- -->
-
-<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.plugins.cdo</artifactId>
-	</parent>
-	
-	<!-- Project POM -->
-	<artifactId>org.eclipse.papyrus.cdo.ui.customization.properties</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/pom.xml b/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/pom.xml
deleted file mode 100755
index c2eeaa3..0000000
--- a/plugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2017 CEA LIST.
-   
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-   
-     Contributors:
-     		CEA LIST - Initial API and implementation
- -->
-
-<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.plugins.cdo</artifactId>
-	</parent>
-	
-	<!-- Project POM -->
-	<artifactId>org.eclipse.papyrus.cdo.ui.hyperlink</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/pom.xml b/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/pom.xml
deleted file mode 100755
index 910bb0b..0000000
--- a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2017 CEA LIST.
-   
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-   
-     Contributors:
-     		CEA LIST - Initial API and implementation
- -->
-
-<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.plugins.cdo</artifactId>
-	</parent>
-	
-	<!-- Project POM -->
-  <groupId>org.eclipse.papyrus</groupId>
-  <artifactId>org.eclipse.papyrus.cdo.ui.tests</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
-  <packaging>eclipse-test-plugin</packaging>
-</project>
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui/pom.xml b/plugins/cdo/org.eclipse.papyrus.cdo.ui/pom.xml
deleted file mode 100755
index 38e737d..0000000
--- a/plugins/cdo/org.eclipse.papyrus.cdo.ui/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2017 CEA LIST.
-   
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-   
-     Contributors:
-     		CEA LIST - Initial API and implementation
- -->
-
-<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.plugins.cdo</artifactId>
-	</parent>
-	
-	<!-- Project POM -->
-	<artifactId>org.eclipse.papyrus.cdo.ui</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/pom.xml b/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/pom.xml
deleted file mode 100755
index ac0367a..0000000
--- a/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2017 CEA LIST.
-   
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-   
-     Contributors:
-     		CEA LIST - Initial API and implementation
- -->
-
-<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.plugins.cdo</artifactId>
-	</parent>
-	
-	<!-- Project POM -->
-	<artifactId>org.eclipse.papyrus.cdo.uml.diagram.ui</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/pom.xml b/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/pom.xml
deleted file mode 100755
index 52d7285..0000000
--- a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2017 CEA LIST.
-   
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-   
-     Contributors:
-     		CEA LIST - Initial API and implementation
- -->
-
-<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.plugins.cdo</artifactId>
-	</parent>
-	
-	<!-- Project POM -->
-  <groupId>org.eclipse.papyrus</groupId>
-  <artifactId>org.eclipse.papyrus.cdo.uml.search.ui.tests</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
-  <packaging>eclipse-test-plugin</packaging>
-</project>
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/pom.xml b/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/pom.xml
deleted file mode 100755
index 51cc2eb..0000000
--- a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2017 CEA LIST.
-   
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-   
-     Contributors:
-     		CEA LIST - Initial API and implementation
- -->
-
-<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.plugins.cdo</artifactId>
-	</parent>
-	
-	<!-- Project POM -->
-	<artifactId>org.eclipse.papyrus.cdo.uml.search.ui</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/pom.xml b/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/pom.xml
deleted file mode 100755
index 935ea59..0000000
--- a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2017 CEA LIST.
-   
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-   
-     Contributors:
-     		CEA LIST - Initial API and implementation
- -->
-
-<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.plugins.cdo</artifactId>
-	</parent>
-	
-	<!-- Project POM -->
-  <groupId>org.eclipse.papyrus</groupId>
-  <artifactId>org.eclipse.papyrus.cdo.uml.ui.tests</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
-  <packaging>eclipse-test-plugin</packaging>
-</project>
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/pom.xml b/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/pom.xml
deleted file mode 100755
index 3d77934..0000000
--- a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2017 CEA LIST.
-   
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-   
-     Contributors:
-     		CEA LIST - Initial API and implementation
- -->
-
-<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.plugins.cdo</artifactId>
-	</parent>
-	
-	<!-- Project POM -->
-	<artifactId>org.eclipse.papyrus.cdo.uml.ui</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/pom.xml b/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/pom.xml
deleted file mode 100755
index adc6df9..0000000
--- a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2017 CEA LIST.
-   
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-   
-     Contributors:
-     		CEA LIST - Initial API and implementation
- -->
-
-<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.plugins.cdo</artifactId>
-	</parent>
-	
-	<!-- Project POM -->
-	<artifactId>org.eclipse.papyrus.cdo.validation.problems.edit</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/pom.xml b/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/pom.xml
deleted file mode 100755
index ec51124..0000000
--- a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2017 CEA LIST.
-   
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-   
-     Contributors:
-     		CEA LIST - Initial API and implementation
- -->
-
-<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.plugins.cdo</artifactId>
-	</parent>
-	
-	<!-- Project POM -->
-  <groupId>org.eclipse.papyrus</groupId>
-  <artifactId>org.eclipse.papyrus.cdo.validation.problems.tests</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
-  <packaging>eclipse-test-plugin</packaging>
-</project>
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/pom.xml b/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/pom.xml
deleted file mode 100755
index e02d1b3..0000000
--- a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2017 CEA LIST.
-   
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-   
-     Contributors:
-     		CEA LIST - Initial API and implementation
- -->
-
-<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.plugins.cdo</artifactId>
-	</parent>
-	
-	<!-- Project POM -->
-	<artifactId>org.eclipse.papyrus.cdo.validation.problems</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/plugins/cdo/org.eclipse.papyrus.extra.cdo.feature/pom.xml b/plugins/cdo/org.eclipse.papyrus.extra.cdo.feature/pom.xml
deleted file mode 100755
index 8f7006f..0000000
--- a/plugins/cdo/org.eclipse.papyrus.extra.cdo.feature/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2017 CEA LIST.
-   
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-   
-     Contributors:
-     		CEA LIST - Initial API and implementation
- -->
-
-<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.plugins.cdo</artifactId>
-	</parent>
-	
-	<!-- Project POM -->
-	<artifactId>org.eclipse.papyrus.extra.cdo.feature</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
\ No newline at end of file
diff --git a/plugins/cdo/pom.xml b/plugins/cdo/pom.xml
index e5f99c8..a095365 100755
--- a/plugins/cdo/pom.xml
+++ b/plugins/cdo/pom.xml
@@ -1,94 +1,440 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2017 CEA LIST.
-   
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-   
-     Contributors:
-     		CEA LIST - Initial API and implementation
- -->
-
 <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.plugins</artifactId>
-	</parent>
-	
 	<!-- Project POM (aggregator) -->
-	<groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
-	<artifactId>org.eclipse.papyrus.collaborativemodeling.plugins.cdo</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
+	<groupId>org.eclipse.papyrus.cdo</groupId>
+	<artifactId>org.eclipse.papyrus.cdo.root</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
-	<name>Collaborative Modeling</name>
-	<description>Papyrus Collaborative Modeling</description>
+	<name>Collaborative Modeling - CDO</name>
+
+	<properties>
+		<tycho-version>1.0.0</tycho-version>
+		<tychoExtrasVersion>1.0.0</tychoExtrasVersion>
+		<jarSignerVersion>1.1.2</jarSignerVersion>
+		<findbugs.version>3.0.1</findbugs.version>
+		<xtext.version>2.11.0</xtext.version>
+		<jboss.version>0.26.0</jboss.version>
+		<jacoco.version>0.7.9</jacoco.version>
+		<testConfig>CI_TESTS_CONFIG</testConfig>
+		<test.argLine>-Xms512m -Xmx2048m -XX:SoftRefLRUPolicyMSPerMB=100</test.argLine>
+		<java.source>1.8</java.source>
+		<java.target>1.8</java.target>
+		<mylyn.wikitext.version>2.4.0-SNAPSHOT</mylyn.wikitext.version>
+
+		<targetPlatform.groupID>org.eclipse.papyrus.cdo</targetPlatform.groupID>
+		<targetPlatform.artifactID>org.eclipse.papyrus.cdo.targetplatform</targetPlatform.artifactID>
+		<targetPlatform.version>1.2.0-SNAPSHOT</targetPlatform.version>
+	</properties>
+
 
 	<!-- Children modules to build -->
 	<modules>
-			
+		<module>bundles</module>				
+		<module>features</module>				
+		<module>releng</module>				
+		<module>tests</module>
 	</modules>
-	
+			
+	<pluginRepositories>
+		<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>
+		<pluginRepository>
+			<id>eclipse.org-mylyn</id>
+			<!-- url>https://repo.eclipse.org/content/repositories/mylyn-releases/</url -->
+			<url>https://repo.eclipse.org/content/repositories/mylyn/</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>org.jboss.tools.tycho-plugins</id>
+			<url>https://repository.jboss.org/</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-resources-plugin</artifactId>
+					<version>2.7</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-clean-plugin</artifactId>
+					<version>3.0.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-compiler-plugin</artifactId>
+					<version>${tycho-version}</version>
+				</plugin>
+				<!-- enable tycho build extension -->
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-maven-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<extensions>true</extensions>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-p2-repository-plugin</artifactId>
+					<version>${tycho-version}</version>
+				</plugin>
+				<plugin><!-- enable source bundle generation -->
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-source-plugin</artifactId>
+					<version>${tycho-version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho.extras</groupId>
+					<artifactId>tycho-source-feature-plugin</artifactId>
+					<version>${tychoExtrasVersion}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-p2-plugin</artifactId>
+					<version>${tycho-version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-p2-director-plugin</artifactId>
+					<version>${tycho-version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<version>${jacoco-version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-surefire-plugin</artifactId>
+					<version>${tycho-version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>target-platform-configuration</artifactId>
+					<version>${tycho-version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho.extras</groupId>
+					<artifactId>tycho-pack200a-plugin</artifactId>
+					<version>${tychoExtrasVersion}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho.extras</groupId>
+					<artifactId>tycho-pack200b-plugin</artifactId>
+					<version>${tychoExtrasVersion}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.cbi.maven.plugins</groupId>
+					<artifactId>eclipse-jarsigner-plugin</artifactId>
+					<version>${jarSignerVersion}</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<configuration>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-compiler-plugin</artifactId>
+				<configuration>
+					<source>${java.source}</source>
+					<target>${java.target}</target>
+					<optimize>true</optimize>
+					<showWarnings>true</showWarnings>
+				</configuration>
+			</plugin>
+			<!-- enable tycho build extension -->
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-maven-plugin</artifactId>
+				<extensions>true</extensions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-repository-plugin</artifactId>
+			</plugin>
+			<plugin><!-- enable source bundle generation -->
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>plugin-source</id>
+						<goals>
+							<goal>plugin-source</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>source-feature</id>
+						<phase>package</phase>
+						<goals>
+							<goal>source-feature</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-p2-metadata</id>
+						<phase>package</phase>
+						<goals>
+							<goal>p2-metadata</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<defaultP2Metadata>false</defaultP2Metadata>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<configuration>
+					<includePackedArtifacts>true</includePackedArtifacts>
+					<targetDefinitionIncludeSource>honor</targetDefinitionIncludeSource>
+					<environments>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86_64</arch>
+						</environment>
+					</environments>
+					<target>
+						<artifact>
+							<groupId>${targetPlatform.groupID}</groupId>
+							<artifactId>${targetPlatform.artifactID}</artifactId>
+							<version>${targetPlatform.version}</version>
+						</artifact>
+					</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>${jacoco.version}</version>
+				<configuration>
+					<excludes>
+						<exclude>org.eclipse.uml2</exclude>
+					</excludes>
+					<includes>
+						<include>org.eclipse.papyrus.*</include>
+					</includes>
+				</configuration>
+				<executions>
+					<execution>
+						<id>default-prepare-agent</id>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>default-report</id>
+						<goals>
+							<goal>report</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<failIfNoTests>false</failIfNoTests>
+					<useUIHarness>true</useUIHarness>
+					<useUIThread>true</useUIThread>
+					<testFailureIgnore>true</testFailureIgnore>
+					<!-- ${tycho.testArgLine} is populated by JaCoCo and is required to enable code coverage -->
+					<argLine>${tycho.testArgLine} ${test.argLine}</argLine>
+					<appArgLine>-testConfig=${testConfig}</appArgLine>
+					<product>org.eclipse.sdk.ide</product>
+					<skipTests>${skipInnerTests}</skipTests>
+				</configuration>
+			</plugin>
+		</plugins>	
+	</build>
+
 	<profiles>
-		<!-- Profile dedicated to compile the cdo sources -->
 		<profile>
-			<id>cdoSources</id>
+			<id>eclipsehippIntegration</id>
 			<activation>
 				<property>
-					<name>!skipCdoSources</name>
+					<name>HUDSON_URL</name>
 				</property>
 			</activation>
-			<modules>
-				<module>org.eclipse.papyrus.cdo.core</module>
-				<module>org.eclipse.papyrus.cdo.ui</module>
-				<module>org.eclipse.papyrus.cdo.ui.customization.properties</module>
-				<module>org.eclipse.papyrus.cdo.ui.hyperlink</module>
-				<module>org.eclipse.papyrus.cdo.uml.diagram.ui</module>
-				<module>org.eclipse.papyrus.cdo.uml.search.ui</module>
-				<module>org.eclipse.papyrus.cdo.uml.ui</module>
-				<module>org.eclipse.papyrus.cdo.validation.problems</module>
-				<module>org.eclipse.papyrus.cdo.validation.problems.edit</module>
-				
-				<module>org.eclipse.papyrus.extra.cdo.feature</module>
-			</modules>
+			<properties>
+				<target.suffix>eclipse</target.suffix> <!-- set to 'eclipse' when building on HIPP, to improve performances -->
+			</properties>
+		</profile>
+		<profile>
+			<id>localIntegration</id>
+			<activation>
+				<property>
+					<name>!HUDSON_URL</name>
+				</property>
+			</activation>
+			<properties>
+				<target.suffix>portable</target.suffix>
+			</properties>
 		</profile>
 		
-		<!-- Profile dedicated to launch the tests -->
 		<profile>
-			<id>cdoTests</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
+			<id>packAndSign</id> <!-- Stable release profile. Takes +30min. Eclipse servers only -->
+			<!-- Pack200 -->
 			<build>
 				<plugins>
 					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-pack200a-plugin</artifactId>
+						<version>${tychoExtrasVersion}</version>
+						<executions>
+							<execution>
+								<id>pack200-normalize</id>
+								<goals>
+									<goal>normalize</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.eclipse.cbi.maven.plugins</groupId>
+						<artifactId>eclipse-jarsigner-plugin</artifactId>
+						<version>${jarSignerVersion}</version>
+						<executions>
+							<execution>
+								<id>sign</id>
+								<goals>
+									<goal>sign</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-pack200b-plugin</artifactId>
+						<version>${tychoExtrasVersion}</version>
+						<executions>
+							<execution>
+								<id>pack200-pack</id>
+								<goals>
+									<goal>pack</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
 						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>tycho-surefire-plugin</artifactId>
+						<artifactId>tycho-p2-plugin</artifactId>
 						<version>${tycho-version}</version>
+						<executions>
+							<execution>
+								<id>attach-p2-metadata</id>
+								<phase>package</phase>
+								<goals>
+									<goal>p2-metadata</goal>
+								</goals>
+							</execution>
+						</executions>
 						<configuration>
-							<useUIHarness>true</useUIHarness>
-							<useUIThread>true</useUIThread>
-							<testFailureIgnore>true</testFailureIgnore>
-							<product>org.eclipse.sdk.ide</product>
+							<defaultP2Metadata>false</defaultP2Metadata>
 						</configuration>
 					</plugin>
 				</plugins>
-			</build>			
-			<modules>
-				<module>org.eclipse.papyrus.cdo.core.tests</module>
-				<module>org.eclipse.papyrus.cdo.ui.tests</module>
-				<module>org.eclipse.papyrus.cdo.uml.search.ui.tests</module>
-				<module>org.eclipse.papyrus.cdo.uml.ui.tests</module>
-				<module>org.eclipse.papyrus.cdo.validation.problems.tests</module>
-			</modules>
+			</build>
+			<activation>
+				<property>
+					<name>SIGN</name>
+					<value>true</value>
+				</property>
+			</activation>
 		</profile>
+
+
+		<profile>
+			<id>pack</id> <!-- Nightly profile. Artifacts can be consumed, but are not signed -->
+			<build>
+				<plugins>
+					<!-- Pack200 -->
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-pack200b-plugin</artifactId>
+						<version>${tychoExtrasVersion}</version>
+						<executions>
+							<execution>
+								<id>pack200-pack</id>
+								<goals>
+									<goal>pack</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-p2-plugin</artifactId>
+						<version>${tycho-version}</version>
+						<executions>
+							<execution>
+								<id>attach-p2-metadata</id>
+								<phase>package</phase>
+								<goals>
+									<goal>p2-metadata</goal>
+								</goals>
+							</execution>
+						</executions>
+						<configuration>
+							<defaultP2Metadata>false</defaultP2Metadata>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+			<activation>
+				<property>
+					<name>SIGN</name>
+					<value>false</value>
+				</property>
+			</activation>
+		</profile>
+
 	</profiles>
-		
-	
-</project>	
+</project>
diff --git a/plugins/cdo/releng/org.eclipse.papyrus.cdo.p2/.project b/plugins/cdo/releng/org.eclipse.papyrus.cdo.p2/.project
new file mode 100755
index 0000000..a1875db
--- /dev/null
+++ b/plugins/cdo/releng/org.eclipse.papyrus.cdo.p2/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.cdo.p2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/plugins/cdo/releng/org.eclipse.papyrus.cdo.p2/category.xml b/plugins/cdo/releng/org.eclipse.papyrus.cdo.p2/category.xml
new file mode 100755
index 0000000..9614f62
--- /dev/null
+++ b/plugins/cdo/releng/org.eclipse.papyrus.cdo.p2/category.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+  <feature url="features/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="features/org.eclipse.papyrus.cdo.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.cdo.feature.source" version="1.2.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/plugins/cdo/releng/org.eclipse.papyrus.cdo.p2/pom.xml b/plugins/cdo/releng/org.eclipse.papyrus.cdo.p2/pom.xml
new file mode 100755
index 0000000..326219a
--- /dev/null
+++ b/plugins/cdo/releng/org.eclipse.papyrus.cdo.p2/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo-releng</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.cdo.p2</artifactId>
+	<packaging>eclipse-repository</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/plugins/cdo/releng/pom.xml b/plugins/cdo/releng/pom.xml
new file mode 100755
index 0000000..4fd2539
--- /dev/null
+++ b/plugins/cdo/releng/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<!-- Parent of this POM is the Collaborative Modeling project root POM  -->
+	<parent>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo.root</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<!-- POM description -->
+	<artifactId>org.eclipse.papyrus.cdo-releng</artifactId>
+	<packaging>pom</packaging>
+	
+	<!-- Modules to build -->
+	<modules>
+		<module>org.eclipse.papyrus.cdo.p2</module>
+		<module>targetplatforms</module>
+	</modules>
+	
+</project>
\ No newline at end of file
diff --git a/plugins/cdo/releng/targetplatforms/eclipse/org.eclipse.papyrus.cdo.targetplatform.target b/plugins/cdo/releng/targetplatforms/eclipse/org.eclipse.papyrus.cdo.targetplatform.target
new file mode 100755
index 0000000..f9a3284
--- /dev/null
+++ b/plugins/cdo/releng/targetplatforms/eclipse/org.eclipse.papyrus.cdo.targetplatform.target
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="CollaborativeModeling CDO - Oxygen" sequenceNumber="1531985438">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" 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="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/>
+      <repository id="Papyrus-Oxygen" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.junit.utils" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.junit.framework" version="0.0.0"/>
+      <repository location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.cdo.explorer" version="4.5.100.v20161101-0751"/>
+      <unit id="org.eclipse.emf.cdo.dawn" version="2.0.500.v20161018-1819"/>
+      <unit id="org.eclipse.emf.cdo.dawn.gmf" version="2.1.400.v20161018-1819"/>
+      <unit id="org.eclipse.emf.cdo.admin" version="4.1.500.v20161018-1819"/>
+      <unit id="org.eclipse.emf.cdo.explorer.ui" version="4.4.200.v20161018-1819"/>
+      <unit id="org.eclipse.emf.cdo.ui.admin" version="4.1.400.v20161018-1819"/>
+      <unit id="org.eclipse.emf.cdo.server.ocl" version="4.2.200.v20161018-1819"/>
+      <repository id="cdo" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/cdo/drops/R20170614-0227"/>
+    </location>
+  </locations>
+</target>
diff --git a/plugins/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target b/plugins/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target
new file mode 100755
index 0000000..4dbb273
--- /dev/null
+++ b/plugins/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.target
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="CollaborativeModeling CDO - Oxygen" sequenceNumber="1531985438">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" 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="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/>
+      <repository id="Papyrus-Oxygen" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.junit.utils" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.junit.framework" version="0.0.0"/>
+      <repository location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.cdo.explorer" version="4.5.100.v20161101-0751"/>
+      <unit id="org.eclipse.emf.cdo.dawn" version="2.0.500.v20161018-1819"/>
+      <unit id="org.eclipse.emf.cdo.dawn.gmf" version="2.1.400.v20161018-1819"/>
+      <unit id="org.eclipse.emf.cdo.admin" version="4.1.500.v20161018-1819"/>
+      <unit id="org.eclipse.emf.cdo.explorer.ui" version="4.4.200.v20161018-1819"/>
+      <unit id="org.eclipse.emf.cdo.ui.admin" version="4.1.400.v20161018-1819"/>
+      <unit id="org.eclipse.emf.cdo.server.ocl" version="4.2.200.v20161018-1819"/>
+      <repository id="cdo" location="http://download.eclipse.org/modeling/emf/cdo/drops/R20170614-0227"/>
+    </location>
+  </locations>
+</target>
diff --git a/plugins/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd b/plugins/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd
new file mode 100755
index 0000000..0b643bf
--- /dev/null
+++ b/plugins/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/org.eclipse.papyrus.cdo.targetplatform.tpd
@@ -0,0 +1,34 @@
+target "CollaborativeModeling CDO - Oxygen" with source requirements
+
+location "http://download.eclipse.org/releases/oxygen/" eclipse-oxygen {
+ org.eclipse.sdk.feature.group 
+}
+
+/** Manual dependencies */
+
+//manualUpdate
+location papyrusOxygenN "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/" {
+ org.eclipse.papyrus.sdk.feature.feature.group lazy
+ org.eclipse.papyrus.toolsmiths.feature.feature.group 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
+}
+
+
+
+/** Automatic dependencies */
+
+//updateFrom("EMF CDO",0) 
+location cdo "http://download.eclipse.org/modeling/emf/cdo/drops/R20170614-0227" {
+ org.eclipse.emf.cdo.explorer 
+ org.eclipse.emf.cdo.dawn
+ org.eclipse.emf.cdo.dawn.gmf
+ org.eclipse.emf.cdo.admin
+ org.eclipse.emf.cdo.explorer.ui
+ org.eclipse.emf.cdo.ui.admin
+ org.eclipse.emf.cdo.server.ocl
+}
\ No newline at end of file
diff --git a/plugins/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/pom.xml b/plugins/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/pom.xml
new file mode 100755
index 0000000..ce9725a
--- /dev/null
+++ b/plugins/cdo/releng/targetplatforms/org.eclipse.papyrus.cdo.targetplatform/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo-targetplatforms</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>	
+	
+	<artifactId>org.eclipse.papyrus.cdo.targetplatform</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	
+</project>
\ No newline at end of file
diff --git a/plugins/cdo/releng/targetplatforms/pom.xml b/plugins/cdo/releng/targetplatforms/pom.xml
new file mode 100755
index 0000000..763fde5
--- /dev/null
+++ b/plugins/cdo/releng/targetplatforms/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo-releng</artifactId>		
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.cdo-targetplatforms</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.cdo.targetplatform</module>
+	</modules>
+	
+</project>
\ No newline at end of file
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/.classpath b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.classpath
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core.tests/.classpath
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.classpath
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/.project b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.project
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core.tests/.project
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.project
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core.tests/.settings/org.eclipse.jdt.core.prefs
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/.settings/org.eclipse.jdt.ui.prefs b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core.tests/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/Papyrus CDO Core Tests.launch b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/Papyrus CDO Core Tests.launch
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core.tests/Papyrus CDO Core Tests.launch
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/Papyrus CDO Core Tests.launch
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/about.html b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/about.html
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core.tests/about.html
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/about.html
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/build.properties b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/build.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core.tests/build.properties
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/build.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/plugin.properties b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/plugin.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core.tests/plugin.properties
rename to plugins/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/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/pom.xml
new file mode 100755
index 0000000..2cc45c3
--- /dev/null
+++ b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/pom.xml
@@ -0,0 +1,17 @@
+<?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>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo-tests</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<!-- Project POM -->
+  <artifactId>org.eclipse.papyrus.cdo.core.tests</artifactId>
+  <version>1.2.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+</project>
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.di b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.di
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.di
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.di
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.notation b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.notation
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.notation
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.notation
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.uml b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.uml
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.uml
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/empty/model.uml
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependencies.zip b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependencies.zip
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependencies.zip
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependencies.zip
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependents.zip b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependents.zip
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependents.zip
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/has_dependents.zip
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/resources/projects/isolated.zip b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/isolated.zip
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core.tests/resources/projects/isolated.zip
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/projects/isolated.zip
Binary files differ
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/resources/xmi/A.ecore b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/xmi/A.ecore
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core.tests/resources/xmi/A.ecore
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/xmi/A.ecore
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/resources/xmi/B.ecore b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/xmi/B.ecore
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core.tests/resources/xmi/B.ecore
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/resources/xmi/B.ecore
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/resource/tests/CDOAwareModelSetTest.java b/plugins/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/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/resource/tests/CDOAwareModelSetTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/resource/tests/CDOAwareModelSetTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AbstractPapyrusCDOTest.java b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AbstractPapyrusCDOTest.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AbstractPapyrusCDOTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AbstractPapyrusCDOTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AllTests.java b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AllTests.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AllTests.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AllTests.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/ResourceSetFactory.java b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/ResourceSetFactory.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/ResourceSetFactory.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/ResourceSetFactory.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/TestProject.java b/plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/TestProject.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/TestProject.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/TestProject.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/AllUtilTests.java b/plugins/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/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/AllUtilTests.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/AllUtilTests.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/CDOFunctionsTest.java b/plugins/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/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/CDOFunctionsTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/CDOFunctionsTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/CDOPredicatesTest.java b/plugins/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/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/CDOPredicatesTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/CDOPredicatesTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/JobWaiterTest.java b/plugins/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/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/JobWaiterTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/JobWaiterTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/controlmode/tests/CDOControlModeTest.java b/plugins/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/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/controlmode/tests/CDOControlModeTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/controlmode/tests/CDOControlModeTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/AbstractModelExportTest.java b/plugins/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/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/AbstractModelExportTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/AbstractModelExportTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/AllModelExportTests.java b/plugins/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/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/AllModelExportTests.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/AllModelExportTests.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/ModelExportMappingTest.java b/plugins/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/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/ModelExportMappingTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/ModelExportMappingTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/ModelExporterTest.java b/plugins/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/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/ModelExporterTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/ModelExporterTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/expressions/tests/AllExpressionsTests.java b/plugins/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/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/expressions/tests/AllExpressionsTests.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/expressions/tests/AllExpressionsTests.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/expressions/tests/EObjectPropertyTesterTest.java b/plugins/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/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/expressions/tests/EObjectPropertyTesterTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/expressions/tests/EObjectPropertyTesterTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/AllModelImportTests.java b/plugins/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/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/AllModelImportTests.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/AllModelImportTests.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ManyToOneModelImportMappingTest.java b/plugins/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/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ManyToOneModelImportMappingTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ManyToOneModelImportMappingTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImportConfigurationTest.java b/plugins/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/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImportConfigurationTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImportConfigurationTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImporterTest.java b/plugins/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/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImporterTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImporterTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/OneToOneModelImportMappingTest.java b/plugins/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/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/OneToOneModelImportMappingTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/OneToOneModelImportMappingTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/tests/AllInternalCoreTests.java b/plugins/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/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/tests/AllInternalCoreTests.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/tests/AllInternalCoreTests.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/tests/CDOUtilsTest.java b/plugins/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/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/tests/CDOUtilsTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/tests/CDOUtilsTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.tests/.classpath b/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/.classpath
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.tests/.classpath
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/.classpath
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.tests/.project b/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/.project
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.tests/.project
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/.project
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.tests/.settings/org.eclipse.jdt.core.prefs
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.tests/.settings/org.eclipse.jdt.ui.prefs b/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.tests/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.tests/META-INF/MANIFEST.MF b/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.tests/META-INF/MANIFEST.MF
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.tests/Papyrus All CDO Tests.launch b/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/Papyrus All CDO Tests.launch
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.tests/Papyrus All CDO Tests.launch
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/Papyrus All CDO Tests.launch
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.tests/about.html b/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/about.html
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.tests/about.html
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/about.html
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.tests/build.properties b/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/build.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.tests/build.properties
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/build.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.tests/plugin.properties b/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/plugin.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.tests/plugin.properties
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/plugin.properties
diff --git a/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/pom.xml b/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/pom.xml
new file mode 100755
index 0000000..419e4c2
--- /dev/null
+++ b/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/pom.xml
@@ -0,0 +1,17 @@
+<?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>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo-tests</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<!-- Project POM -->
+  <artifactId>org.eclipse.papyrus.cdo.tests</artifactId>
+  <version>1.2.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+</project>
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.tests/src/org/eclipse/papyrus/cdo/tests/AllTests.java b/plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/src/org/eclipse/papyrus/cdo/tests/AllTests.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.tests/src/org/eclipse/papyrus/cdo/tests/AllTests.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.tests/src/org/eclipse/papyrus/cdo/tests/AllTests.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/.classpath b/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.classpath
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/.classpath
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.classpath
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/.project b/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.project
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/.project
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.project
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/.settings/org.eclipse.jdt.core.prefs
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF b/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/Papyrus CDO UI Tests.launch b/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/Papyrus CDO UI Tests.launch
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/Papyrus CDO UI Tests.launch
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/Papyrus CDO UI Tests.launch
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/about.html b/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/about.html
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/about.html
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/about.html
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/build.properties b/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/build.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/build.properties
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/build.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/plugin.properties b/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/plugin.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/plugin.properties
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/plugin.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/plugin.xml b/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/plugin.xml
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/plugin.xml
rename to plugins/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/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/pom.xml
new file mode 100755
index 0000000..093f394
--- /dev/null
+++ b/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/pom.xml
@@ -0,0 +1,17 @@
+<?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>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo-tests</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<!-- Project POM -->
+  <artifactId>org.eclipse.papyrus.cdo.ui.tests</artifactId>
+  <version>1.2.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+</project>
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/resources/model.di b/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.di
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/resources/model.di
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.di
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/resources/model.notation b/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.notation
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/resources/model.notation
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.notation
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/resources/model.uml b/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.uml
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/resources/model.uml
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/resources/model.uml
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/editors/tests/BasicEditorTest.java b/plugins/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/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/editors/tests/BasicEditorTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/editors/tests/BasicEditorTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/editors/tests/DawnEditorAdapterTest.java b/plugins/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/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/editors/tests/DawnEditorAdapterTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/editors/tests/DawnEditorAdapterTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/markers/tests/CDOPapyrusMarkerTest.java b/plugins/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/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/markers/tests/CDOPapyrusMarkerTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/markers/tests/CDOPapyrusMarkerTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/markers/tests/ModelValidationMarkersTest.java b/plugins/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/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/markers/tests/ModelValidationMarkersTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/markers/tests/ModelValidationMarkersTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/views/tests/ItemProviderFilterRegistryTest.java b/plugins/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/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/views/tests/ItemProviderFilterRegistryTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/internal/ui/views/tests/ItemProviderFilterRegistryTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AbstractPapyrusCDOUITest.java b/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AbstractPapyrusCDOUITest.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AbstractPapyrusCDOUITest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AbstractPapyrusCDOUITest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AllTests.java b/plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AllTests.java
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AllTests.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.ui.tests/src/org/eclipse/papyrus/cdo/ui/tests/AllTests.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/.classpath b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.classpath
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/.classpath
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.classpath
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/.project b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.project
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/.project
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.project
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/.settings/org.eclipse.jdt.core.prefs
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/Papyrus CDO Search UI Tests.launch b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/Papyrus CDO Search UI Tests.launch
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/Papyrus CDO Search UI Tests.launch
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/Papyrus CDO Search UI Tests.launch
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/about.html b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/about.html
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/about.html
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/about.html
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/build.properties b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/build.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/build.properties
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/build.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/plugin.properties b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/plugin.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/plugin.properties
rename to plugins/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/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/pom.xml
new file mode 100755
index 0000000..89c66dc
--- /dev/null
+++ b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/pom.xml
@@ -0,0 +1,17 @@
+<?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>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo-tests</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<!-- Project POM -->
+  <artifactId>org.eclipse.papyrus.cdo.uml.search.ui.tests</artifactId>
+  <version>1.2.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+</project>
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.di b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.di
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.di
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.di
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.notation b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.notation
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.notation
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.notation
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.uml b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.uml
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.uml
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.uml
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.di b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.di
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.di
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.di
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.notation b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.notation
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.notation
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.notation
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.uml b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.uml
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.uml
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.uml
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.di b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.di
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.di
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.di
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.notation b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.notation
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.notation
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.notation
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.uml b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.uml
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.uml
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.uml
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.di b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.di
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.di
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.di
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.notation b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.notation
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.notation
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.notation
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.uml b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.uml
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.uml
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.uml
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AbstractPapyrusCDOSearchTest.java b/plugins/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/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AbstractPapyrusCDOSearchTest.java
rename to plugins/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/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AdvancedTextSearchTest.java b/plugins/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/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AdvancedTextSearchTest.java
rename to plugins/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/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AllTests.java b/plugins/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/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AllTests.java
rename to plugins/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/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/BasicTextSearchTest.java b/plugins/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/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/BasicTextSearchTest.java
rename to plugins/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/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/SearchScopingTest.java b/plugins/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/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/SearchScopingTest.java
rename to plugins/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/org.eclipse.papyrus.cdo.uml.ui.tests/.classpath b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.classpath
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/.classpath
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.classpath
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/.project b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.project
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/.project
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.project
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/.settings/org.eclipse.jdt.core.prefs
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/META-INF/MANIFEST.MF b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/META-INF/MANIFEST.MF
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/Papyrus CDO UML UI Tests.launch b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/Papyrus CDO UML UI Tests.launch
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/Papyrus CDO UML UI Tests.launch
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/Papyrus CDO UML UI Tests.launch
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/about.html b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/about.html
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/about.html
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/about.html
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/build.properties b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/build.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/build.properties
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/build.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/plugin.properties b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/plugin.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/plugin.properties
rename to plugins/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/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/pom.xml
new file mode 100755
index 0000000..e240d17
--- /dev/null
+++ b/plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/pom.xml
@@ -0,0 +1,17 @@
+<?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>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo-tests</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<!-- Project POM -->
+  <artifactId>org.eclipse.papyrus.cdo.uml.ui.tests</artifactId>
+  <version>1.2.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+</project>
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/src/org/eclipse/papyrus/cdo/uml/internal/ui/importsources/tests/CDOPackageImportSourceTest.java b/plugins/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/org.eclipse.papyrus.cdo.uml.ui.tests/src/org/eclipse/papyrus/cdo/uml/internal/ui/importsources/tests/CDOPackageImportSourceTest.java
rename to plugins/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/org.eclipse.papyrus.cdo.uml.ui.tests/src/org/eclipse/papyrus/cdo/uml/ui/tests/AllTests.java b/plugins/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/org.eclipse.papyrus.cdo.uml.ui.tests/src/org/eclipse/papyrus/cdo/uml/ui/tests/AllTests.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.uml.ui.tests/src/org/eclipse/papyrus/cdo/uml/ui/tests/AllTests.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/.classpath b/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.classpath
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/.classpath
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.classpath
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/.project b/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.project
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/.project
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.project
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/.settings/org.eclipse.jdt.core.prefs
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/.settings/org.eclipse.jdt.ui.prefs b/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/META-INF/MANIFEST.MF b/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/META-INF/MANIFEST.MF
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/META-INF/MANIFEST.MF
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/about.html b/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/about.html
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/about.html
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/about.html
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/build.properties b/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/build.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/build.properties
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/build.properties
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/plugin.properties b/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/plugin.properties
similarity index 100%
rename from plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/plugin.properties
rename to plugins/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/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/pom.xml
new file mode 100755
index 0000000..4fd8064
--- /dev/null
+++ b/plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/pom.xml
@@ -0,0 +1,17 @@
+<?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>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo-tests</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	
+	<!-- Project POM -->
+  <artifactId>org.eclipse.papyrus.cdo.validation.problems.tests</artifactId>
+  <version>1.2.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+</project>
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/edit/tests/AllProblemsEditTests.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/edit/tests/AllProblemsEditTests.java
rename to plugins/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/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/edit/tests/ProblemEditUtilTest.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/edit/tests/ProblemEditUtilTest.java
rename to plugins/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/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/AttributeTest.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/AttributeTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/AttributeTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemTest.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemsContainerTest.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemsContainerTest.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemsContainerTest.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsAllTests.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsAllTests.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsAllTests.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsTests.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsTests.java
rename to plugins/cdo/tests/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsTests.java
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/util/tests/AllUtilTests.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/util/tests/AllUtilTests.java
rename to plugins/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/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/util/tests/ProblemsManagerTest.java b/plugins/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/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/util/tests/ProblemsManagerTest.java
rename to plugins/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/plugins/cdo/tests/pom.xml
new file mode 100755
index 0000000..2284801
--- /dev/null
+++ b/plugins/cdo/tests/pom.xml
@@ -0,0 +1,26 @@
+<?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>
+		<groupId>org.eclipse.papyrus.cdo</groupId>
+		<artifactId>org.eclipse.papyrus.cdo.root</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+
+	<!-- Project POM -->
+	<artifactId>org.eclipse.papyrus.cdo-tests</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.cdo.core.tests</module>
+		<module>org.eclipse.papyrus.cdo.tests</module>
+		<module>org.eclipse.papyrus.cdo.ui.tests</module>
+		<module>org.eclipse.papyrus.cdo.uml.search.ui.tests</module>
+		<module>org.eclipse.papyrus.cdo.uml.ui.tests</module>
+		<module>org.eclipse.papyrus.cdo.validation.problems.tests</module>	
+	</modules>
+	
+</project>
\ No newline at end of file
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/.classpath b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/.classpath
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/.classpath
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/.classpath
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/.project b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/.project
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/.project
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/.project
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/.settings/org.eclipse.jdt.core.prefs b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/.settings/org.eclipse.jdt.core.prefs
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/META-INF/MANIFEST.MF b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/META-INF/MANIFEST.MF
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/META-INF/MANIFEST.MF
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/about.html b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/about.html
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/about.html
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/about.html
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/build.properties b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/build.properties
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/build.properties
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/build.properties
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc.html b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc.html
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc.html
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc.html
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/colorschememapping.xml b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/colorschememapping.xml
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/colorschememapping.xml
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/colorschememapping.xml
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/filelist.xml b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/filelist.xml
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/filelist.xml
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/filelist.xml
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/themedata.thmx b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/themedata.thmx
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/themedata.thmx
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/DeveloperDoc_fichiers/themedata.thmx
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/default.css b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/default.css
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/default.css
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/default.css
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/AddReview_screen.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/AddReview_screen.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/AddReview_screen.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/AddReview_screen.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Add_A_review_diagram.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Add_A_review_diagram.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Add_A_review_diagram.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Add_A_review_diagram.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/AddaReview.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/AddaReview.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/AddaReview.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/AddaReview.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Architecture_Overview.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Architecture_Overview.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Architecture_Overview.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Architecture_Overview.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClaseEditors.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClaseEditors.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClaseEditors.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClaseEditors.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClassDiagram.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClassDiagram.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClassDiagram.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClassDiagram.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClassDiagram_about_dialog_package.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClassDiagram_about_dialog_package.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClassDiagram_about_dialog_package.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ClassDiagram_about_dialog_package.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_advice_package.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_advice_package.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_advice_package.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_advice_package.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_the_command_package.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_the_command_package.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_the_command_package.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_the_command_package.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_the_handlers_package.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_the_handlers_package.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_the_handlers_package.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Class_Diagram_of_the_handlers_package.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/CloseEditors.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/CloseEditors.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/CloseEditors.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/CloseEditors.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/CommentManaging_UseCases.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/CommentManaging_UseCases.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/CommentManaging_UseCases.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/CommentManaging_UseCases.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/DeleteReview.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/DeleteReview.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/DeleteReview.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/DeleteReview.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Diagram_class_of_the_core_package.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Diagram_class_of_the_core_package.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Diagram_class_of_the_core_package.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Diagram_class_of_the_core_package.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/GUI_architecture.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/GUI_architecture.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/GUI_architecture.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/GUI_architecture.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/HookElement.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/HookElement.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/HookElement.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/HookElement.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/New_Author.PNG b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/New_Author.PNG
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/New_Author.PNG
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/New_Author.PNG
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/OpenSaveReview.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/OpenSaveReview.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/OpenSaveReview.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/OpenSaveReview.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Overview_of_the_package_architecture.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Overview_of_the_package_architecture.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Overview_of_the_package_architecture.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Overview_of_the_package_architecture.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Papyrus_Model_Versionning_profile_description..png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Papyrus_Model_Versionning_profile_description..png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Papyrus_Model_Versionning_profile_description..png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Papyrus_Model_Versionning_profile_description..png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Plug-ins_architecture_.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Plug-ins_architecture_.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Plug-ins_architecture_.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Plug-ins_architecture_.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/ProfileDiagram.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ProfileDiagram.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/ProfileDiagram.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ProfileDiagram.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Register_modifications.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Register_modifications.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Register_modifications.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Register_modifications.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Remove_a_Review.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Remove_a_Review.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Remove_a_Review.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Remove_a_Review.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/RespondComment.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/RespondComment.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/RespondComment.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/RespondComment.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/ReviewSystem_UseCases.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ReviewSystem_UseCases.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/ReviewSystem_UseCases.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/ReviewSystem_UseCases.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Review_Element_test.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Review_Element_test.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Review_Element_test.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Review_Element_test.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Review_profile.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Review_profile.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Review_profile.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Review_profile.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Revision_mode_Use_Case.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Revision_mode_Use_Case.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Revision_mode_Use_Case.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Revision_mode_Use_Case.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModifications.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModifications.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModifications.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModifications.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModificationsDiagram.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModificationsDiagram.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModificationsDiagram.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModificationsDiagram.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModificationsModelExplorer.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModificationsModelExplorer.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModificationsModelExplorer.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/SeeModificationsModelExplorer.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/See_modifications_in_model_explorer.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/See_modifications_in_model_explorer.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/See_modifications_in_model_explorer.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/See_modifications_in_model_explorer.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Strop_revision_test.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Strop_revision_test.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Strop_revision_test.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Strop_revision_test.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Test_about_load_a_review_model.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Test_about_load_a_review_model.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/Test_about_load_a_review_model.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/Test_about_load_a_review_model.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/UseCaseDiagram.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/UseCaseDiagram.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/UseCaseDiagram.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/UseCaseDiagram.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/UserIdentity.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/UserIdentity.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/UserIdentity.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/UserIdentity.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/addComment.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/addComment.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/addComment.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/addComment.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/launchRevisionMode.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/launchRevisionMode.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/launchRevisionMode.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/launchRevisionMode.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/modificationInDiagramsTest.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/modificationInDiagramsTest.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/modificationInDiagramsTest.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/modificationInDiagramsTest.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/package_architecture.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/package_architecture.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/package_architecture.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/package_architecture.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/respond_to_a_review_Test.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/respond_to_a_review_Test.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/respond_to_a_review_Test.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/respond_to_a_review_Test.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/testLaunchRevision.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/testLaunchRevision.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/imgDOC/testLaunchRevision.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/imgDOC/testLaunchRevision.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.di b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.di
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.di
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.di
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.notation b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.notation
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.notation
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.notation
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.uml b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.uml
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.uml
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/About Model Reviewing/PapyrusMM4ModelCommentingFeature.uml
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.di b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.di
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.di
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.di
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.notation b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.notation
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.notation
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.notation
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.uml b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.uml
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.uml
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/CommentModel.uml
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/PapyrusModelVersioning.profile.uml b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/PapyrusModelVersioning.profile.uml
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/PapyrusModelVersioning.profile.uml
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/PapyrusModelVersioning.profile.uml
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/ReviewModel.uml b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/ReviewModel.uml
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/ReviewModel.uml
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/ReviewModel.uml
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/review1.uml b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/review1.uml
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/review1.uml
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/review1.uml
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.di b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.di
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.di
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.di
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.notation b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.notation
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.notation
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.notation
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.uml b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.uml
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.uml
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.uml
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/icons/sample.gif b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/icons/sample.gif
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/icons/sample.gif
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/icons/sample.gif
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/img/Add.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/Add.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/img/Add.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/Add.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/img/Add.svg b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/Add.svg
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/img/Add.svg
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/Add.svg
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/img/CommentIcon.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/CommentIcon.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/img/CommentIcon.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/CommentIcon.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/img/CommentIcon.svg b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/CommentIcon.svg
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/img/CommentIcon.svg
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/CommentIcon.svg
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/img/Delete.svg b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/Delete.svg
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/img/Delete.svg
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/Delete.svg
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/img/accept.JPG b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/accept.JPG
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/img/accept.JPG
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/accept.JPG
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/img/delete.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/delete.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/img/delete.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/delete.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/img/hook.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/hook.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/img/hook.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/hook.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/img/hook.svg b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/hook.svg
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/img/hook.svg
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/hook.svg
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/img/load.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/load.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/img/load.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/load.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/img/propertyviewContextlink.png b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/propertyviewContextlink.png
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/img/propertyviewContextlink.png
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/propertyviewContextlink.png
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/img/refuse.JPG b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/refuse.JPG
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/img/refuse.JPG
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/img/refuse.JPG
Binary files differ
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/plugin.properties b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/plugin.properties
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/plugin.properties
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/plugin.properties
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/plugin.xml b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/plugin.xml
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/plugin.xml
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/plugin.xml
diff --git a/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/pom.xml b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/pom.xml
new file mode 100755
index 0000000..b122ecc
--- /dev/null
+++ b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/pom.xml
@@ -0,0 +1,17 @@
+<?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>
+		<groupId>org.eclipse.papyrus.revisiontool</groupId>
+		<artifactId>org.eclipse.papyrus.revisiontool-bundles</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<!-- Project POM (aggregator) -->
+	<artifactId>org.eclipse.papyrus.revisiontool</artifactId>
+	<version>0.7.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/Review.ctx b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/Review.ctx
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/properties/Review.ctx
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/Review.ctx
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleAnswer.xwt b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleAnswer.xwt
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleAnswer.xwt
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleAnswer.xwt
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleComment.xwt b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleComment.xwt
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleComment.xwt
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleComment.xwt
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleQuestion.xwt b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleQuestion.xwt
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleQuestion.xwt
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleQuestion.xwt
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReview.xwt b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReview.xwt
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReview.xwt
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReview.xwt
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReviewRepository.xwt b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReviewRepository.xwt
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReviewRepository.xwt
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReviewRepository.xwt
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleTodo.xwt b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleTodo.xwt
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleTodo.xwt
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/MultipleTodo.xwt
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleAnswer.xwt b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleAnswer.xwt
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleAnswer.xwt
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleAnswer.xwt
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleComment.xwt b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleComment.xwt
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleComment.xwt
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleComment.xwt
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleQuestion.xwt b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleQuestion.xwt
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleQuestion.xwt
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleQuestion.xwt
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleReview.xwt b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleReview.xwt
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleReview.xwt
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleReview.xwt
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleReviewRepository.xwt b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleReviewRepository.xwt
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleReviewRepository.xwt
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleReviewRepository.xwt
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleTodo.xwt b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleTodo.xwt
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleTodo.xwt
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/properties/ui/SingleTodo.xwt
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/resource/Changes.profile.di b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Changes.profile.di
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/resource/Changes.profile.di
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Changes.profile.di
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/resource/Changes.profile.notation b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Changes.profile.notation
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/resource/Changes.profile.notation
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Changes.profile.notation
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/resource/Changes.profile.uml b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Changes.profile.uml
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/resource/Changes.profile.uml
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Changes.profile.uml
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/resource/PapyrusModelVersioning.profile.uml b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/PapyrusModelVersioning.profile.uml
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/resource/PapyrusModelVersioning.profile.uml
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/PapyrusModelVersioning.profile.uml
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/resource/Review.profile.di b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Review.profile.di
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/resource/Review.profile.di
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Review.profile.di
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/resource/Review.profile.notation b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Review.profile.notation
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/resource/Review.profile.notation
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Review.profile.notation
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/resource/Review.profile.uml b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Review.profile.uml
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/resource/Review.profile.uml
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Review.profile.uml
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.di b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.di
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.di
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.di
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.notation b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.notation
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.notation
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.notation
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.uml b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.uml
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.uml
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/Versioning.profile.uml
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/resource/customizationConfiguration.xmi b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/customizationConfiguration.xmi
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/resource/customizationConfiguration.xmi
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/customizationConfiguration.xmi
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/resource/revision.custom b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/revision.custom
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/resource/revision.custom
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/resource/revision.custom
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/Activator.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/Activator.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/Activator.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/Activator.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/advice/AdviceRemove.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/advice/AdviceRemove.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/advice/AdviceRemove.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/advice/AdviceRemove.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateDifferenceCommand.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateDifferenceCommand.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateDifferenceCommand.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateDifferenceCommand.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateMatchCommand.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateMatchCommand.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateMatchCommand.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateMatchCommand.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateToDoReviewCommand.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateToDoReviewCommand.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateToDoReviewCommand.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/CreateToDoReviewCommand.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/PreventRemoveCommand.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/PreventRemoveCommand.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/PreventRemoveCommand.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/command/PreventRemoveCommand.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/AddingDiffListener.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/AddingDiffListener.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/AddingDiffListener.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/AddingDiffListener.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_ReviewStereotype.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_ReviewStereotype.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_ReviewStereotype.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_ReviewStereotype.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_StashChangesStereotype.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_StashChangesStereotype.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_StashChangesStereotype.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_StashChangesStereotype.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_VersioningStereotype.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_VersioningStereotype.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_VersioningStereotype.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/I_VersioningStereotype.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/RefreshFigureListener.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/RefreshFigureListener.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/RefreshFigureListener.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/RefreshFigureListener.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/ReviewResourceManager.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/ReviewResourceManager.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/ReviewResourceManager.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/ReviewResourceManager.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/dialogs/CreateAuthorDialog.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/dialogs/CreateAuthorDialog.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/dialogs/CreateAuthorDialog.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/dialogs/CreateAuthorDialog.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/dialogs/CreateOrSelectReviewModelDialog.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/dialogs/CreateOrSelectReviewModelDialog.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/dialogs/CreateOrSelectReviewModelDialog.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/dialogs/CreateOrSelectReviewModelDialog.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/AcceptReviewHandler.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/AcceptReviewHandler.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/AcceptReviewHandler.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/AcceptReviewHandler.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/DeleteReviewHandler.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/DeleteReviewHandler.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/DeleteReviewHandler.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/DeleteReviewHandler.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/DisplayStatHandler.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/DisplayStatHandler.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/DisplayStatHandler.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/DisplayStatHandler.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/HookReviewHandler.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/HookReviewHandler.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/HookReviewHandler.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/HookReviewHandler.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/IDMAbstractHandler.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/IDMAbstractHandler.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/IDMAbstractHandler.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/IDMAbstractHandler.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/LaunchRevisionMode.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/LaunchRevisionMode.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/LaunchRevisionMode.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/LaunchRevisionMode.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/RefuseReviewHandler.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/RefuseReviewHandler.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/RefuseReviewHandler.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/RefuseReviewHandler.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/ReviewCreateHandler.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/ReviewCreateHandler.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/ReviewCreateHandler.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/ReviewCreateHandler.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/RevisionAbstractHandler.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/RevisionAbstractHandler.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/RevisionAbstractHandler.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/RevisionAbstractHandler.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/SaveSnapshotRevision.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/SaveSnapshotRevision.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/SaveSnapshotRevision.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/SaveSnapshotRevision.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/ReviewPreferenceInitializer.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/ReviewPreferenceInitializer.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/ReviewPreferenceInitializer.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/ReviewPreferenceInitializer.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/RevisionPreferenceConstants.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/RevisionPreferenceConstants.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/RevisionPreferenceConstants.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/RevisionPreferenceConstants.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/RevisionPreferencePage.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/RevisionPreferencePage.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/RevisionPreferencePage.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/preference/RevisionPreferencePage.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/queries/GetBackgroundColor.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/queries/GetBackgroundColor.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/queries/GetBackgroundColor.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/queries/GetBackgroundColor.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/queries/GetStrike.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/queries/GetStrike.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/queries/GetStrike.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/queries/GetStrike.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/AddingFig.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/AddingFig.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/AddingFig.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/AddingFig.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RemovedFig.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RemovedFig.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RemovedFig.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RemovedFig.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsEditor.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsEditor.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsEditor.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsEditor.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsTreeContentProvider.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsTreeContentProvider.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsTreeContentProvider.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsTreeContentProvider.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsTreeLabelProvider.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsTreeLabelProvider.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsTreeLabelProvider.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsTreeLabelProvider.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RevisonDiagLayer.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RevisonDiagLayer.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RevisonDiagLayer.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RevisonDiagLayer.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/SWTQualitativeInfo.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/SWTQualitativeInfo.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/SWTQualitativeInfo.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/SWTQualitativeInfo.java
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/SetFig.java b/plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/SetFig.java
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/SetFig.java
rename to plugins/revision/bundles/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/SetFig.java
diff --git a/plugins/revision/bundles/pom.xml b/plugins/revision/bundles/pom.xml
new file mode 100755
index 0000000..6fa55b0
--- /dev/null
+++ b/plugins/revision/bundles/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<!-- Parent of this POM -->
+	<parent>
+		<groupId>org.eclipse.papyrus.revisiontool</groupId>
+		<artifactId>org.eclipse.papyrus.revisiontool.root</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<!-- Project POM (aggregator) -->
+	<artifactId>org.eclipse.papyrus.revisiontool-bundles</artifactId>
+	<packaging>pom</packaging>
+
+	<!-- Children modules to build -->
+	<modules>
+		<module>org.eclipse.papyrus.revisiontool</module>
+	</modules>
+	
+</project>
\ No newline at end of file
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool.feature/.project b/plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/.project
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool.feature/.project
rename to plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/.project
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool.feature/build.properties b/plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/build.properties
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool.feature/build.properties
rename to plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/build.properties
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool.feature/epl-v10.html b/plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/epl-v10.html
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool.feature/epl-v10.html
rename to plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/epl-v10.html
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool.feature/feature.properties b/plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/feature.properties
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool.feature/feature.properties
rename to plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/feature.properties
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool.feature/feature.xml b/plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/feature.xml
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool.feature/feature.xml
rename to plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/feature.xml
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool.feature/license.html b/plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/license.html
similarity index 100%
rename from plugins/revision/org.eclipse.papyrus.revisiontool.feature/license.html
rename to plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/license.html
diff --git a/plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/pom.xml b/plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/pom.xml
new file mode 100755
index 0000000..6d2991c
--- /dev/null
+++ b/plugins/revision/features/org.eclipse.papyrus.revisiontool.feature/pom.xml
@@ -0,0 +1,17 @@
+<?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>
+		<groupId>org.eclipse.papyrus.revisiontool</groupId>
+		<artifactId>org.eclipse.papyrus.revisiontool-features</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<!-- Project POM (aggregator) -->
+	<artifactId>org.eclipse.papyrus.revisiontool.feature</artifactId>
+	<version>0.7.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/plugins/revision/features/pom.xml b/plugins/revision/features/pom.xml
new file mode 100755
index 0000000..3e9752f
--- /dev/null
+++ b/plugins/revision/features/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<!-- Parent of this POM -->
+	<parent>
+		<groupId>org.eclipse.papyrus.revisiontool</groupId>
+		<artifactId>org.eclipse.papyrus.revisiontool.root</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+
+	<!-- Project root POM (aggregator) -->
+	<artifactId>org.eclipse.papyrus.revisiontool-features</artifactId>
+	<packaging>pom</packaging>
+
+	<!-- Children modules to build -->
+	<modules>
+		<module>org.eclipse.papyrus.revisiontool.feature</module>
+	</modules>
+
+</project>
\ No newline at end of file
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool.feature/pom.xml b/plugins/revision/org.eclipse.papyrus.revisiontool.feature/pom.xml
deleted file mode 100755
index 8b81c5d..0000000
--- a/plugins/revision/org.eclipse.papyrus.revisiontool.feature/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2017 CEA LIST.
-   
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-   
-     Contributors:
-     		CEA LIST - Initial API and implementation
- -->
-
-<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.plugins.revision</artifactId>
-	</parent>
-	
-	<!-- Project POM (aggregator) -->
-	<artifactId>org.eclipse.papyrus.revisiontool.feature</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
\ No newline at end of file
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/pom.xml b/plugins/revision/org.eclipse.papyrus.revisiontool/pom.xml
deleted file mode 100755
index 960f1f0..0000000
--- a/plugins/revision/org.eclipse.papyrus.revisiontool/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2017 CEA LIST.
-   
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-   
-     Contributors:
-     		CEA LIST - Initial API and implementation
- -->
-
-<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.plugins.revision</artifactId>
-	</parent>
-	
-	<!-- Project POM (aggregator) -->
-	<artifactId>org.eclipse.papyrus.revisiontool</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/plugins/revision/pom.xml b/plugins/revision/pom.xml
index c310fab..329c53b 100755
--- a/plugins/revision/pom.xml
+++ b/plugins/revision/pom.xml
@@ -1,36 +1,393 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2017 CEA LIST.
-   
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-   
-     Contributors:
-     		CEA LIST - Initial API and implementation
- -->
-
 <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.plugins</artifactId>
-	</parent>
-	
 	<!-- Project POM (aggregator) -->
-	<artifactId>org.eclipse.papyrus.collaborativemodeling.plugins.revision</artifactId>
+	<groupId>org.eclipse.papyrus.revisiontool</groupId>
+	<artifactId>org.eclipse.papyrus.revisiontool.root</artifactId>
+	<version>0.7.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
-	<name>Collaborative Modeling revision</name>
-	
-	<!-- Modules to build -->
+	<name>Collaborative Modeling - Revision Tool</name>
+
+	<properties>
+		<tycho-version>1.0.0</tycho-version>
+		<tychoExtrasVersion>1.0.0</tychoExtrasVersion>
+		<jarSignerVersion>1.1.2</jarSignerVersion>
+		<findbugs.version>3.0.1</findbugs.version>
+		<xtext.version>2.11.0</xtext.version>
+		<jboss.version>0.26.0</jboss.version>
+		<java.source>1.8</java.source>
+		<java.target>1.8</java.target>
+		<mylyn.wikitext.version>2.4.0-SNAPSHOT</mylyn.wikitext.version>
+
+		<targetPlatform.groupID>org.eclipse.papyrus.revisiontool</targetPlatform.groupID>
+		<targetPlatform.artifactID>org.eclipse.papyrus.revisiontool.targetplatform</targetPlatform.artifactID>
+		<targetPlatform.version>0.7.0-SNAPSHOT</targetPlatform.version>
+	</properties>
+
+
+	<!-- Children modules to build -->
 	<modules>
-		<module>org.eclipse.papyrus.revisiontool</module>
-		<module>org.eclipse.papyrus.revisiontool.feature</module>
+		<module>bundles</module>				
+		<module>features</module>				
+		<module>releng</module>
 	</modules>
-	
+			
+	<pluginRepositories>
+		<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>
+		<pluginRepository>
+			<id>eclipse.org-mylyn</id>
+			<!-- url>https://repo.eclipse.org/content/repositories/mylyn-releases/</url -->
+			<url>https://repo.eclipse.org/content/repositories/mylyn/</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>org.jboss.tools.tycho-plugins</id>
+			<url>https://repository.jboss.org/</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-resources-plugin</artifactId>
+					<version>2.7</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-clean-plugin</artifactId>
+					<version>3.0.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-compiler-plugin</artifactId>
+					<version>${tycho-version}</version>
+				</plugin>
+				<!-- enable tycho build extension -->
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-maven-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<extensions>true</extensions>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-p2-repository-plugin</artifactId>
+					<version>${tycho-version}</version>
+				</plugin>
+				<plugin><!-- enable source bundle generation -->
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-source-plugin</artifactId>
+					<version>${tycho-version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho.extras</groupId>
+					<artifactId>tycho-source-feature-plugin</artifactId>
+					<version>${tychoExtrasVersion}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-p2-plugin</artifactId>
+					<version>${tycho-version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-p2-director-plugin</artifactId>
+					<version>${tycho-version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<version>${jacoco-version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-surefire-plugin</artifactId>
+					<version>${tycho-version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>target-platform-configuration</artifactId>
+					<version>${tycho-version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho.extras</groupId>
+					<artifactId>tycho-pack200a-plugin</artifactId>
+					<version>${tychoExtrasVersion}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho.extras</groupId>
+					<artifactId>tycho-pack200b-plugin</artifactId>
+					<version>${tychoExtrasVersion}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.cbi.maven.plugins</groupId>
+					<artifactId>eclipse-jarsigner-plugin</artifactId>
+					<version>${jarSignerVersion}</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<configuration>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-compiler-plugin</artifactId>
+				<configuration>
+					<source>${java.source}</source>
+					<target>${java.target}</target>
+					<optimize>true</optimize>
+					<showWarnings>true</showWarnings>
+				</configuration>
+			</plugin>
+			<!-- enable tycho build extension -->
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-maven-plugin</artifactId>
+				<extensions>true</extensions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-repository-plugin</artifactId>
+			</plugin>
+			<plugin><!-- enable source bundle generation -->
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>plugin-source</id>
+						<goals>
+							<goal>plugin-source</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>source-feature</id>
+						<phase>package</phase>
+						<goals>
+							<goal>source-feature</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-p2-metadata</id>
+						<phase>package</phase>
+						<goals>
+							<goal>p2-metadata</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<defaultP2Metadata>false</defaultP2Metadata>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<configuration>
+					<includePackedArtifacts>true</includePackedArtifacts>
+					<targetDefinitionIncludeSource>honor</targetDefinitionIncludeSource>
+					<environments>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86_64</arch>
+						</environment>
+					</environments>
+					<target>
+						<artifact>
+							<groupId>${targetPlatform.groupID}</groupId>
+							<artifactId>${targetPlatform.artifactID}</artifactId>
+							<version>${targetPlatform.version}</version>
+						</artifact>
+					</target>
+				</configuration>
+			</plugin>
+		</plugins>	
+	</build>
+
+	<profiles>
+		<profile>
+			<id>eclipsehippIntegration</id>
+			<activation>
+				<property>
+					<name>HUDSON_URL</name>
+				</property>
+			</activation>
+			<properties>
+				<target.suffix>eclipse</target.suffix> <!-- set to 'eclipse' when building on HIPP, to improve performances -->
+			</properties>
+		</profile>
+		<profile>
+			<id>localIntegration</id>
+			<activation>
+				<property>
+					<name>!HUDSON_URL</name>
+				</property>
+			</activation>
+			<properties>
+				<target.suffix>portable</target.suffix>
+			</properties>
+		</profile>
+		
+		<profile>
+			<id>packAndSign</id> <!-- Stable release profile. Takes +30min. Eclipse servers only -->
+			<!-- Pack200 -->
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-pack200a-plugin</artifactId>
+						<version>${tychoExtrasVersion}</version>
+						<executions>
+							<execution>
+								<id>pack200-normalize</id>
+								<goals>
+									<goal>normalize</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.eclipse.cbi.maven.plugins</groupId>
+						<artifactId>eclipse-jarsigner-plugin</artifactId>
+						<version>${jarSignerVersion}</version>
+						<executions>
+							<execution>
+								<id>sign</id>
+								<goals>
+									<goal>sign</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-pack200b-plugin</artifactId>
+						<version>${tychoExtrasVersion}</version>
+						<executions>
+							<execution>
+								<id>pack200-pack</id>
+								<goals>
+									<goal>pack</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-p2-plugin</artifactId>
+						<version>${tycho-version}</version>
+						<executions>
+							<execution>
+								<id>attach-p2-metadata</id>
+								<phase>package</phase>
+								<goals>
+									<goal>p2-metadata</goal>
+								</goals>
+							</execution>
+						</executions>
+						<configuration>
+							<defaultP2Metadata>false</defaultP2Metadata>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+			<activation>
+				<property>
+					<name>SIGN</name>
+					<value>true</value>
+				</property>
+			</activation>
+		</profile>
+
+
+		<profile>
+			<id>pack</id> <!-- Nightly profile. Artifacts can be consumed, but are not signed -->
+			<build>
+				<plugins>
+					<!-- Pack200 -->
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-pack200b-plugin</artifactId>
+						<version>${tychoExtrasVersion}</version>
+						<executions>
+							<execution>
+								<id>pack200-pack</id>
+								<goals>
+									<goal>pack</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-p2-plugin</artifactId>
+						<version>${tycho-version}</version>
+						<executions>
+							<execution>
+								<id>attach-p2-metadata</id>
+								<phase>package</phase>
+								<goals>
+									<goal>p2-metadata</goal>
+								</goals>
+							</execution>
+						</executions>
+						<configuration>
+							<defaultP2Metadata>false</defaultP2Metadata>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+			<activation>
+				<property>
+					<name>SIGN</name>
+					<value>false</value>
+				</property>
+			</activation>
+		</profile>
+
+	</profiles>
 </project>
diff --git a/plugins/revision/releng/org.eclipse.papyrus.revisiontool.p2/.project b/plugins/revision/releng/org.eclipse.papyrus.revisiontool.p2/.project
new file mode 100755
index 0000000..a1875db
--- /dev/null
+++ b/plugins/revision/releng/org.eclipse.papyrus.revisiontool.p2/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.cdo.p2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/plugins/revision/releng/org.eclipse.papyrus.revisiontool.p2/category.xml b/plugins/revision/releng/org.eclipse.papyrus.revisiontool.p2/category.xml
new file mode 100755
index 0000000..0d56e82
--- /dev/null
+++ b/plugins/revision/releng/org.eclipse.papyrus.revisiontool.p2/category.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+  <feature url="features/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.revisiontool.feature.source_0.7.0.qualifier.jar" id="org.eclipse.papyrus.revisiontool.feature.source" 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/plugins/revision/releng/org.eclipse.papyrus.revisiontool.p2/pom.xml b/plugins/revision/releng/org.eclipse.papyrus.revisiontool.p2/pom.xml
new file mode 100755
index 0000000..73ca1f2
--- /dev/null
+++ b/plugins/revision/releng/org.eclipse.papyrus.revisiontool.p2/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.revisiontool</groupId>
+		<artifactId>org.eclipse.papyrus.revisiontool-releng</artifactId>		
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.revisiontool.p2</artifactId>
+	<packaging>eclipse-repository</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/plugins/revision/releng/pom.xml b/plugins/revision/releng/pom.xml
new file mode 100755
index 0000000..398757e
--- /dev/null
+++ b/plugins/revision/releng/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<!-- Parent of this POM is the Collaborative Modeling project root POM  -->
+	<parent>
+		<groupId>org.eclipse.papyrus.revisiontool</groupId>
+		<artifactId>org.eclipse.papyrus.revisiontool.root</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<!-- POM description -->
+	<artifactId>org.eclipse.papyrus.revisiontool-releng</artifactId>
+	<packaging>pom</packaging>
+	
+	<!-- Modules to build -->
+	<modules>
+		<module>org.eclipse.papyrus.revisiontool.p2</module>
+		<module>targetplatforms</module>
+	</modules>
+	
+</project>
\ No newline at end of file
diff --git a/plugins/revision/releng/targetplatforms/eclipse/org.eclipse.papyrus.revisiontool.targetplatform.target b/plugins/revision/releng/targetplatforms/eclipse/org.eclipse.papyrus.revisiontool.targetplatform.target
new file mode 100755
index 0000000..b8ffd27
--- /dev/null
+++ b/plugins/revision/releng/targetplatforms/eclipse/org.eclipse.papyrus.revisiontool.targetplatform.target
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="CollaborativeModeling CDO - Oxygen" sequenceNumber="1531985555">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" 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="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/>
+      <repository id="Papyrus-Oxygen" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare" version="3.5.1.201709090201"/>
+      <unit id="org.eclipse.emf.compare.rcp" version="2.5.1.201709090201"/>
+      <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201709090201"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.cdo.explorer" version="4.5.100.v20161101-0751"/>
+      <unit id="org.eclipse.emf.cdo.dawn" version="2.0.500.v20161018-1819"/>
+      <unit id="org.eclipse.emf.cdo.dawn.gmf" version="2.1.400.v20161018-1819"/>
+      <unit id="org.eclipse.emf.cdo.admin" version="4.1.500.v20161018-1819"/>
+      <unit id="org.eclipse.emf.cdo.explorer.ui" version="4.4.200.v20161018-1819"/>
+      <unit id="org.eclipse.emf.cdo.ui.admin" version="4.1.400.v20161018-1819"/>
+      <repository id="cdo" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/cdo/drops/R20170614-0227"/>
+    </location>
+  </locations>
+</target>
diff --git a/plugins/revision/releng/targetplatforms/org.eclipse.papyrus.revisiontool.targetplatform/org.eclipse.papyrus.revisiontool.targetplatform.target b/plugins/revision/releng/targetplatforms/org.eclipse.papyrus.revisiontool.targetplatform/org.eclipse.papyrus.revisiontool.targetplatform.target
new file mode 100755
index 0000000..8bdbff2
--- /dev/null
+++ b/plugins/revision/releng/targetplatforms/org.eclipse.papyrus.revisiontool.targetplatform/org.eclipse.papyrus.revisiontool.targetplatform.target
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="CollaborativeModeling CDO - Oxygen" sequenceNumber="1531985555">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" 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="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/>
+      <repository id="Papyrus-Oxygen" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare" version="3.5.1.201709090201"/>
+      <unit id="org.eclipse.emf.compare.rcp" version="2.5.1.201709090201"/>
+      <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201709090201"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.cdo.explorer" version="4.5.100.v20161101-0751"/>
+      <unit id="org.eclipse.emf.cdo.dawn" version="2.0.500.v20161018-1819"/>
+      <unit id="org.eclipse.emf.cdo.dawn.gmf" version="2.1.400.v20161018-1819"/>
+      <unit id="org.eclipse.emf.cdo.admin" version="4.1.500.v20161018-1819"/>
+      <unit id="org.eclipse.emf.cdo.explorer.ui" version="4.4.200.v20161018-1819"/>
+      <unit id="org.eclipse.emf.cdo.ui.admin" version="4.1.400.v20161018-1819"/>
+      <repository id="cdo" location="http://download.eclipse.org/modeling/emf/cdo/drops/R20170614-0227"/>
+    </location>
+  </locations>
+</target>
diff --git a/plugins/revision/releng/targetplatforms/org.eclipse.papyrus.revisiontool.targetplatform/org.eclipse.papyrus.revisiontool.targetplatform.tpd b/plugins/revision/releng/targetplatforms/org.eclipse.papyrus.revisiontool.targetplatform/org.eclipse.papyrus.revisiontool.targetplatform.tpd
new file mode 100755
index 0000000..155cbc1
--- /dev/null
+++ b/plugins/revision/releng/targetplatforms/org.eclipse.papyrus.revisiontool.targetplatform/org.eclipse.papyrus.revisiontool.targetplatform.tpd
@@ -0,0 +1,33 @@
+target "CollaborativeModeling CDO - Oxygen" with source requirements
+
+location "http://download.eclipse.org/releases/oxygen/" eclipse-oxygen {
+ org.eclipse.sdk.feature.group 
+}
+
+/** Manual dependencies */
+
+//manualUpdate
+location papyrusOxygenN "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/" {
+ org.eclipse.papyrus.sdk.feature.feature.group lazy
+ org.eclipse.papyrus.toolsmiths.feature.feature.group lazy
+}
+
+
+
+/** Automatic dependencies */
+
+//updateFrom("EMF COMPARE", 0)
+location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201709090201" {
+ org.eclipse.emf.compare
+ org.eclipse.emf.compare.rcp
+}
+
+//updateFrom("EMF CDO",0) 
+location cdo "http://download.eclipse.org/modeling/emf/cdo/drops/R20170614-0227" {
+ org.eclipse.emf.cdo.explorer
+ org.eclipse.emf.cdo.dawn
+ org.eclipse.emf.cdo.dawn.gmf
+ org.eclipse.emf.cdo.admin
+ org.eclipse.emf.cdo.explorer.ui
+ org.eclipse.emf.cdo.ui.admin
+}
\ No newline at end of file
diff --git a/plugins/revision/releng/targetplatforms/org.eclipse.papyrus.revisiontool.targetplatform/pom.xml b/plugins/revision/releng/targetplatforms/org.eclipse.papyrus.revisiontool.targetplatform/pom.xml
new file mode 100755
index 0000000..ab3e01b
--- /dev/null
+++ b/plugins/revision/releng/targetplatforms/org.eclipse.papyrus.revisiontool.targetplatform/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.revisiontool</groupId>
+		<artifactId>org.eclipse.papyrus.revisiontool-targetplatforms</artifactId>		
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>	
+	
+	<artifactId>org.eclipse.papyrus.revisiontool.targetplatform</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	
+</project>
\ No newline at end of file
diff --git a/plugins/revision/releng/targetplatforms/pom.xml b/plugins/revision/releng/targetplatforms/pom.xml
new file mode 100755
index 0000000..2398c93
--- /dev/null
+++ b/plugins/revision/releng/targetplatforms/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.eclipse.papyrus.revisiontool</groupId>
+		<artifactId>org.eclipse.papyrus.revisiontool-releng</artifactId>		
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>org.eclipse.papyrus.revisiontool-targetplatforms</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.papyrus.revisiontool.targetplatform</module>
+	</modules>
+	
+</project>
\ No newline at end of file
diff --git a/releng/org.eclipse.papyrus.collaborativemodeling.p2/category.xml b/releng/org.eclipse.papyrus.collaborativemodeling.p2/category.xml
index 0025f52..b3a7e72 100755
--- a/releng/org.eclipse.papyrus.collaborativemodeling.p2/category.xml
+++ b/releng/org.eclipse.papyrus.collaborativemodeling.p2/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="plugins/cdo/org.eclipse.papyrus.extra.cdo.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.cdo.feature" version="1.2.0.qualifier">
+   <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">
diff --git a/releng/targetplatforms/eclipse/org.eclipse.papyrus.collaborativemodeling.targetplatform.target b/releng/targetplatforms/eclipse/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
index dc64d7a..b938160 100755
--- a/releng/targetplatforms/eclipse/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
+++ b/releng/targetplatforms/eclipse/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
@@ -1,115 +1,25 @@
 <?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="1520586222">
+<target name="Collaborative Modeling Target Platform" sequenceNumber="1531991058">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.draw2d" version="0.0.0"/>
-      <unit id="org.eclipse.gef" version="0.0.0"/>
+      <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.egit.feature.group" version="5.0.1.201806211838-r"/>
-      <unit id="org.eclipse.jgit.feature.group" version="5.0.1.201806211838-r"/>
-      <repository id="EGit" location="file:/home/data/httpd/download.eclipse.org/egit/updates"/>
+      <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 location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+      <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.xwt" version="1.3.1.I20171018-2059"/>
-      <repository id="xwt" location="file:/home/data/httpd/download.eclipse.org/xwt/updates"/>
-    </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.infra.gmfdiag.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.infra.services.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="0.0.0"/>
-      <repository id="papyrusNightly" 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.ecf.filetransfer.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
-      <repository id="ecf" location="file:/home/data/httpd/download.eclipse.org/rt/ecf/3.13.8/site.p2"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="0.0.0"/>
-      <repository id="qvto" location="file:/home/data/httpd/download.eclipse.org/mmt/qvto/updates/releases/3.7.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
-      <repository id="xtend" location="file:/home/data/httpd/download.eclipse.org/modeling/tmf/xtext/updates/releases/2.12.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xpand.sdk.feature.group" version="0.0.0"/>
-      <repository id="xpand" location="file:/home/data/httpd/download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
-    </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.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.wst.common.fproj.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.9.3/R-3.9.3-20180302093744/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.cdatetime.feature.feature.group" version="0.0.0"/>
-      <repository id="nebula" location="file:/home/data/httpd/download.eclipse.org/nebula/releases/1.3.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.net4j.sdk.feature.group" version="0.0.0"/>
-      <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"/>
-      <unit id="org.eclipse.emf.mwe2.runtime.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.graphiti.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="graphiti" location="file:/home/data/httpd/download.eclipse.org/graphiti/updates/milestones/S-0.14.0M7-201705161212/"/>
-    </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.emf.validation.sdk.feature.group" version="0.0.0"/>
-      <repository id="emfValidation" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/validation/updates/releases/R201706061352"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.workspace.feature.group" version="0.0.0"/>
-      <repository id="emfTransaction" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/transaction/updates/releases/R201706061339"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-      <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201706061354"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-      <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R201706061437"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
-      <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.3"/>
+      <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"/>
@@ -119,14 +29,9 @@
       <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"/>
-      <unit id="org.eclipse.emf.compare.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.eclipse.papyrus.sysml14" version="0.0.0"/>
-      <repository id="sysml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/papyrus/components/sysml14"/>
-    </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"/>
@@ -143,5 +48,35 @@
       <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
index 4a56e01..51f37a5 100755
--- 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
@@ -1,111 +1,25 @@
 <?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="1531307892">
+<target name="Collaborative Modeling Target Platform" sequenceNumber="1531991058">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.draw2d" version="0.0.0"/>
-      <unit id="org.eclipse.gef" version="0.0.0"/>
+      <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.egit.feature.group" version="5.0.1.201806211838-r"/>
-      <unit id="org.eclipse.jgit.feature.group" version="5.0.1.201806211838-r"/>
-      <repository id="EGit" location="http://download.eclipse.org/egit/updates"/>
+      <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 location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/"/>
+      <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.xwt" version="1.3.1.I20171018-2059"/>
-      <repository id="xwt" location="http://download.eclipse.org/xwt/updates"/>
-    </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.infra.gmfdiag.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.infra.services.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="0.0.0"/>
-      <repository id="papyrusNightly" 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.ecf.filetransfer.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
-      <repository id="ecf" location="http://download.eclipse.org/rt/ecf/3.13.8/site.p2"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="0.0.0"/>
-      <repository id="qvto" location="http://download.eclipse.org/mmt/qvto/updates/releases/3.7.0"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
-      <repository id="xtend" location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.12.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xpand.sdk.feature.group" version="0.0.0"/>
-      <repository id="xpand" location="http://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
-    </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.wst.xml_ui.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.wst.common.fproj.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="0.0.0"/>
-      <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.9.3/R-3.9.3-20180302093744/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.cdatetime.feature.feature.group" version="0.0.0"/>
-      <repository id="nebula" location="http://download.eclipse.org/nebula/releases/1.3.0/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.net4j.sdk.feature.group" version="0.0.0"/>
-      <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"/>
-      <unit id="org.eclipse.emf.mwe2.runtime.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.emf.validation.sdk.feature.group" version="0.0.0"/>
-      <repository id="emfValidation" location="http://download.eclipse.org/modeling/emf/validation/updates/releases/R201706061352"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.workspace.feature.group" version="0.0.0"/>
-      <repository id="emfTransaction" location="http://download.eclipse.org/modeling/emf/transaction/updates/releases/R201706061339"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-      <repository id="gmfNotation" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201706061354"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-      <repository id="gmfRuntime" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R201706061437"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
-      <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.3"/>
+      <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"/>
@@ -115,14 +29,9 @@
       <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"/>
-      <unit id="org.eclipse.emf.compare.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.eclipse.papyrus.sysml14" version="0.0.0"/>
-      <repository id="sysml" location="http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14"/>
-    </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"/>
@@ -139,5 +48,35 @@
       <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
index 8666e6a..ebda011 100755
--- 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
@@ -1,144 +1,30 @@
 target "Collaborative Modeling Target Platform"
 
 location "http://download.eclipse.org/releases/oxygen/" eclipse-oxygen {
- org.eclipse.platform.feature.group lazy
- org.eclipse.sdk.feature.group lazy
- org.eclipse.rcp.feature.group lazy
- org.eclipse.jdt.feature.group lazy
- org.eclipse.equinox.p2.discovery.feature.feature.group lazy
- org.eclipse.equinox.executable.feature.group lazy
- 
- org.eclipse.draw2d lazy
- org.eclipse.gef lazy
+ org.eclipse.sdk.feature.group
 }
 
-location "http://download.eclipse.org/egit/updates" EGit {
- org.eclipse.egit.feature.group [4.9.0,6.0.0)
- org.eclipse.jgit.feature.group [4.9.0,6.0.0)
-}
-
-//emf.transaction requires emf.validation
-//cdo.dawn.ui requires draw2d
-//gmf.runtime.diagram.ui require gef
-//papyrus.infra.properties.ui requires xwt
-//papyrus.infra.gmfdiag.tooling.runtime requires org.eclipse.ocl
-//org.eclipse.papyrus.uml.diagram.wizards requires org.eclipse.m2m.qvt.oml
-//papyrus.views.properties.model.xwt requires org.eclipse.wst.xml.core
-//org.eclipse.papyrus.uml.search.ui requires org.eclipse.ocl.pivot.uml> ocl.pivot > ...
-//org.eclipse.papyrus.uml.search.ui requires org.eclipse.ocl.examples.xtext.console> ...
-//org.eclipse.ocl.examples.debug.vm.ui requires bundle org.eclipse.xtext.ui
+/** Manual dependencies */
 
 //manualUpdate
-location "https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/" {
+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
 }
 
-location xwt "http://download.eclipse.org/xwt/updates" {
-	org.eclipse.xwt [1.3.1,2.0.0)
+//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
 }
 
-// Papyrus Oxygen.2 introduces a breaking API change in nattable.common
-// Papyrus dev-tools depend on nattable.common Nightly
-// So we have to use Papyrus nightly, too
-location papyrusNightly "http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen" {
-	 org.eclipse.papyrus.sdk.feature.feature.group lazy
-	 org.eclipse.papyrus.infra.gmfdiag.feature.feature.group lazy
-	 org.eclipse.papyrus.infra.services.feature.feature.group lazy
-	 org.eclipse.papyrus.views.properties.toolsmiths lazy
-} 
-
-
-/** CDO dependencies */
-
-//updateFrom("ECF",0)
-location ecf "http://download.eclipse.org/rt/ecf/3.13.8/site.p2"{
- org.eclipse.ecf.filetransfer.feature.feature.group lazy
- org.eclipse.ecf.core.feature.feature.group lazy
-}
-
-//updateFrom("QVT Operational",0) 
-location qvto "http://download.eclipse.org/mmt/qvto/updates/releases/3.7.0" {
- org.eclipse.m2m.qvt.oml.sdk.feature.group lazy
-}
-
-//updateFrom("Xtext, Xtend",0) 
-location xtend "http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.12.0/" {
- org.eclipse.xtext.sdk.feature.group lazy
- org.eclipse.xtend.sdk.feature.group lazy
-}
-
-//updateFrom("M2T Xpand", 0)
-location xpand "http://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"{
-	org.eclipse.xpand.sdk.feature.group lazy
-}
-
-//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 ("WebTools",0)
-location webtools "http://download.eclipse.org/webtools/downloads/drops/R3.9.3/R-3.9.3-20180302093744/repository/" {
- org.eclipse.wst.xml_ui.feature.feature.group lazy
- org.eclipse.wst.common.fproj.feature.group lazy
- org.eclipse.wst.server_ui.feature.feature.group lazy
-}
-
-//manualUpdate("Nebula")
-location nebula "http://download.eclipse.org/nebula/releases/1.3.0/"{
-	org.eclipse.nebula.widgets.cdatetime.feature.feature.group lazy
-}
-
-//updateFrom("EMF CDO",0) 
-location cdo "http://download.eclipse.org/modeling/emf/cdo/drops/R20170614-0227" {
- 	org.eclipse.net4j.sdk.feature.group lazy
-	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
-	org.eclipse.emf.mwe2.runtime.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("EMF VALIDATION",0)
-location emfValidation "http://download.eclipse.org/modeling/emf/validation/updates/releases/R201706061352" {
-	org.eclipse.emf.validation.sdk.feature.group lazy
-}
-
-//updateFrom("EMF TRANSACTION",0)
-location emfTransaction "http://download.eclipse.org/modeling/emf/transaction/updates/releases/R201706061339" {
-	org.eclipse.emf.transaction.sdk.feature.group lazy
- 	org.eclipse.emf.workspace.feature.group lazy
-}
-
-//updateFrom("GMF Notation",0)
-location gmfNotation "http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201706061354" {
-	org.eclipse.gmf.runtime.notation.sdk.feature.group lazy
-}
-
-//updateFrom("GMF Runtime",0) 
-location gmfRuntime "http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R201706061437" {
-	org.eclipse.gmf.runtime.sdk.feature.group lazy
-}
-
-//updateFrom("MDT UML2",0) 
-location uml "http://download.eclipse.org/modeling/mdt/uml2/updates/5.3" {
-	org.eclipse.uml2.sdk.feature.group lazy
-}
-
-//updateFrom("EMF COMPARE",0) 
+//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
@@ -147,11 +33,6 @@
 	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
-	org.eclipse.emf.compare.feature.group lazy
-}
-//required for Compare test ProfileMigrationTest 
-location sysml "http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14" {
-	org.eclipse.papyrus.sysml14 lazy
 }
 
 //manualUpdate
@@ -174,4 +55,40 @@
 	org.objenesis [1.0.0,2.0.0)
 }
 
-/** Revision Tool additional dependencies */
\ No newline at end of file
+/** 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