diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/.classpath b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/.classpath
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/.classpath
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/.classpath
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/.project b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/.project
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/.project
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/.project
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/.settings/org.eclipse.jdt.core.prefs b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/.settings/org.eclipse.jdt.core.prefs
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/META-INF/MANIFEST.MF b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/META-INF/MANIFEST.MF
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/META-INF/MANIFEST.MF
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/about.html b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/about.html
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/about.html
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/about.html
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/build.properties b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/build.properties
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/build.properties
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/build.properties
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/bundle.properties b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/bundle.properties
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/bundle.properties
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/bundle.properties
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/css/BmmStyle.css b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/css/BmmStyle.css
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/css/BmmStyle.css
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/css/BmmStyle.css
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/Assessment.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/Assessment.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/Assessment.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/Assessment.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/Asset.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/Asset.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/Asset.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/Asset.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/BusinessPolicy.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/BusinessPolicy.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/BusinessPolicy.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/BusinessPolicy.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/BusinessProcess.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/BusinessProcess.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/BusinessProcess.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/BusinessProcess.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/BusinessRule.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/BusinessRule.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/BusinessRule.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/BusinessRule.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/DefaultIcon.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/DefaultIcon.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/DefaultIcon.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/DefaultIcon.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/End.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/End.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/End.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/End.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/ExternalInfluencer.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/ExternalInfluencer.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/ExternalInfluencer.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/ExternalInfluencer.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/Goal.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/Goal.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/Goal.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/Goal.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/InternalInfluencer.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/InternalInfluencer.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/InternalInfluencer.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/InternalInfluencer.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/Means.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/Means.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/Means.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/Means.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/Mission.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/Mission.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/Mission.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/Mission.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/Objective.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/Objective.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/Objective.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/Objective.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/OrganizationUnit.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/OrganizationUnit.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/OrganizationUnit.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/OrganizationUnit.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/PotentialReward.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/PotentialReward.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/PotentialReward.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/PotentialReward.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/Risk.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/Risk.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/Risk.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/Risk.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/Strategy.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/Strategy.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/Strategy.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/Strategy.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/Tactic.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/Tactic.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/Tactic.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/Tactic.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/Vision.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/Vision.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/Vision.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/Vision.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/bmm_16x16.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/bmm_16x16.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/bmm_16x16.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/bmm_16x16.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/bmm_32x32.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/bmm_32x32.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/bmm_32x32.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/bmm_32x32.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/bmm_64x64.png b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/bmm_64x64.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/icons/bmm_64x64.png
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/icons/bmm_64x64.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/palette/Palette_BmmPalette.xml b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/palette/Palette_BmmPalette.xml
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/palette/Palette_BmmPalette.xml
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/palette/Palette_BmmPalette.xml
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/palette/Palette_BmmPalette2.xml b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/palette/Palette_BmmPalette2.xml
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/palette/Palette_BmmPalette2.xml
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/palette/Palette_BmmPalette2.xml
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/plugin.xml b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/plugin.xml
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/plugin.xml
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/plugin.xml
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/pom.xml b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/pom.xml
similarity index 93%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/pom.xml
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/pom.xml
index 27a195b..5db3ac6 100644
--- a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/pom.xml
+++ b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/pom.xml
@@ -23,7 +23,7 @@
 	<!-- Parent POM (i.e., bundles POM) -->
 	<parent>
 		<groupId>org.eclipse.papyrus.requirements</groupId>
-		<artifactId>org.eclipse.papyrus.requirements.plugins.common.bmm</artifactId>
+		<artifactId>org.eclipse.papyrus.requirements.plugins.bmm.gui</artifactId>
 		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 	
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/Assessment.svg b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/Assessment.svg
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/Assessment.svg
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/Assessment.svg
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/Asset.svg b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/Asset.svg
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/Asset.svg
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/Asset.svg
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/BusinessPolicy.svg b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/BusinessPolicy.svg
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/BusinessPolicy.svg
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/BusinessPolicy.svg
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/BusinessProcess.svg b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/BusinessProcess.svg
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/BusinessProcess.svg
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/BusinessProcess.svg
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/BusinessRule.svg b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/BusinessRule.svg
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/BusinessRule.svg
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/BusinessRule.svg
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/DefaultShape.svg b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/DefaultShape.svg
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/DefaultShape.svg
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/DefaultShape.svg
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/ExternalInfluencer.svg b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/ExternalInfluencer.svg
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/ExternalInfluencer.svg
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/ExternalInfluencer.svg
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/Goal.svg b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/Goal.svg
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/Goal.svg
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/Goal.svg
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/InternalInfluencer.svg b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/InternalInfluencer.svg
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/InternalInfluencer.svg
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/InternalInfluencer.svg
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/Mission.svg b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/Mission.svg
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/Mission.svg
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/Mission.svg
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/Objective.svg b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/Objective.svg
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/Objective.svg
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/Objective.svg
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/OrganizationUnit.svg b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/OrganizationUnit.svg
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/OrganizationUnit.svg
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/OrganizationUnit.svg
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/PotentialReward.svg b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/PotentialReward.svg
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/PotentialReward.svg
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/PotentialReward.svg
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/Risk.svg b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/Risk.svg
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/Risk.svg
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/Risk.svg
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/Strategy.svg b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/Strategy.svg
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/Strategy.svg
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/Strategy.svg
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/Tactic.svg b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/Tactic.svg
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/Tactic.svg
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/Tactic.svg
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/Vision.svg b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/Vision.svg
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/shapes/Vision.svg
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/shapes/Vision.svg
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/src/org/eclipse/papyrus/bmm/diagram/common/Activator.java b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/src/org/eclipse/papyrus/bmm/diagram/common/Activator.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/src/org/eclipse/papyrus/bmm/diagram/common/Activator.java
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/src/org/eclipse/papyrus/bmm/diagram/common/Activator.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/src/org/eclipse/papyrus/bmm/diagram/common/commands/CreateBmmModelCommand.java b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/src/org/eclipse/papyrus/bmm/diagram/common/commands/CreateBmmModelCommand.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.common/src/org/eclipse/papyrus/bmm/diagram/common/commands/CreateBmmModelCommand.java
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.common/src/org/eclipse/papyrus/bmm/diagram/common/commands/CreateBmmModelCommand.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.ui/.classpath b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.ui/.classpath
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.ui/.classpath
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.ui/.classpath
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.ui/.project b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.ui/.project
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.ui/.project
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.ui/.project
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.ui/META-INF/MANIFEST.MF b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.ui/META-INF/MANIFEST.MF
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.ui/META-INF/MANIFEST.MF
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.ui/about.html b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.ui/about.html
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.ui/about.html
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.ui/about.html
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.ui/build.properties b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.ui/build.properties
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.ui/build.properties
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.ui/build.properties
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.ui/plugin.properties b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.ui/plugin.properties
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.ui/plugin.properties
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.ui/plugin.properties
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.ui/plugin.xml b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.ui/plugin.xml
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.ui/plugin.xml
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.ui/plugin.xml
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.ui/pom.xml b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.ui/pom.xml
similarity index 93%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.ui/pom.xml
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.ui/pom.xml
index 3abc944..1a62106 100644
--- a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.ui/pom.xml
+++ b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.ui/pom.xml
@@ -23,7 +23,7 @@
 	<!-- Parent POM (i.e., bundles POM) -->
 	<parent>
 		<groupId>org.eclipse.papyrus.requirements</groupId>
-		<artifactId>org.eclipse.papyrus.requirements.plugins.common.bmm</artifactId>
+		<artifactId>org.eclipse.papyrus.requirements.plugins.bmm.gui</artifactId>
 		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 	
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram.ui/src/org/eclipse/papyrus/bmm/diagram/ui/Activator.java b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.ui/src/org/eclipse/papyrus/bmm/diagram/ui/Activator.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram.ui/src/org/eclipse/papyrus/bmm/diagram/ui/Activator.java
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram.ui/src/org/eclipse/papyrus/bmm/diagram/ui/Activator.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram/.classpath b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/.classpath
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram/.classpath
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/.classpath
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram/.project b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/.project
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram/.project
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/.project
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram/META-INF/MANIFEST.MF b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram/META-INF/MANIFEST.MF
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/META-INF/MANIFEST.MF
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram/about.html b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/about.html
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram/about.html
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/about.html
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram/build.properties b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/build.properties
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram/build.properties
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/build.properties
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram/bundle.properties b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/bundle.properties
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram/bundle.properties
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/bundle.properties
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram/plugin.xml b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/plugin.xml
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram/plugin.xml
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/plugin.xml
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram/pom.xml b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/pom.xml
similarity index 93%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram/pom.xml
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/pom.xml
index fdaed41..e103f1f 100644
--- a/plugins/bmm/org.eclipse.papyrus.bmm.diagram/pom.xml
+++ b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/pom.xml
@@ -23,7 +23,7 @@
 	<!-- Parent POM (i.e., bundles POM) -->
 	<parent>
 		<groupId>org.eclipse.papyrus.requirements</groupId>
-		<artifactId>org.eclipse.papyrus.requirements.plugins.common.bmm</artifactId>
+		<artifactId>org.eclipse.papyrus.requirements.plugins.bmm.gui</artifactId>
 		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 	
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram/src/org/eclipse/papyrus/bmm/diagram/Activator.java b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/src/org/eclipse/papyrus/bmm/diagram/Activator.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram/src/org/eclipse/papyrus/bmm/diagram/Activator.java
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/src/org/eclipse/papyrus/bmm/diagram/Activator.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.diagram/viewpoints/bmm.configuration b/plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/viewpoints/bmm.configuration
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.diagram/viewpoints/bmm.configuration
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.diagram/viewpoints/bmm.configuration
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.examples/.classpath b/plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/.classpath
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.examples/.classpath
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/.classpath
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.examples/.project b/plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/.project
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.examples/.project
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/.project
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.examples/.settings/org.eclipse.jdt.core.prefs b/plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.examples/.settings/org.eclipse.jdt.core.prefs
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.examples/META-INF/MANIFEST.MF b/plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.examples/META-INF/MANIFEST.MF
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/META-INF/MANIFEST.MF
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.examples/about.html b/plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/about.html
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.examples/about.html
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/about.html
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.examples/build.properties b/plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/build.properties
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.examples/build.properties
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/build.properties
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.examples/bundle.properties b/plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/bundle.properties
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.examples/bundle.properties
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/bundle.properties
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.examples/models/.project b/plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/models/.project
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.examples/models/.project
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/models/.project
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.examples/models/manufacturing.di b/plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/models/manufacturing.di
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.examples/models/manufacturing.di
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/models/manufacturing.di
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.examples/models/manufacturing.notation b/plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/models/manufacturing.notation
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.examples/models/manufacturing.notation
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/models/manufacturing.notation
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.examples/models/manufacturing.uml b/plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/models/manufacturing.uml
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.examples/models/manufacturing.uml
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/models/manufacturing.uml
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.examples/pom.xml b/plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/pom.xml
similarity index 93%
rename from plugins/bmm/org.eclipse.papyrus.bmm.examples/pom.xml
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/pom.xml
index 73171f5..b647583 100644
--- a/plugins/bmm/org.eclipse.papyrus.bmm.examples/pom.xml
+++ b/plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/pom.xml
@@ -23,7 +23,7 @@
 	<!-- Parent POM (i.e., bundles POM) -->
 	<parent>
 		<groupId>org.eclipse.papyrus.requirements</groupId>
-		<artifactId>org.eclipse.papyrus.requirements.plugins.common.bmm</artifactId>
+		<artifactId>org.eclipse.papyrus.requirements.plugins.bmm.gui</artifactId>
 		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 	
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm.examples/src/org/eclipse/papyrus/bmm/examples/Activator.java b/plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/src/org/eclipse/papyrus/bmm/examples/Activator.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm.examples/src/org/eclipse/papyrus/bmm/examples/Activator.java
rename to plugins/bmm/gui/org.eclipse.papyrus.bmm.examples/src/org/eclipse/papyrus/bmm/examples/Activator.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/pom.xml b/plugins/bmm/gui/pom.xml
similarity index 71%
copy from plugins/bmm/org.eclipse.papyrus.bmm/pom.xml
copy to plugins/bmm/gui/pom.xml
index 1449f84..13c581b 100644
--- a/plugins/bmm/org.eclipse.papyrus.bmm/pom.xml
+++ b/plugins/bmm/gui/pom.xml
@@ -23,13 +23,20 @@
 	<!-- Parent POM (i.e., bundles POM) -->
 	<parent>
 		<groupId>org.eclipse.papyrus.requirements</groupId>
-		<artifactId>org.eclipse.papyrus.requirements.plugins.common.bmm</artifactId>
+		<artifactId>org.eclipse.papyrus.requirements.plugins.bmm</artifactId>
 		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
-	<artifactId>org.eclipse.papyrus.bmm</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>0.7.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
+	<artifactId>org.eclipse.papyrus.requirements.plugins.bmm.gui</artifactId>
+	<packaging>pom</packaging>
+	<name>BMM GUI</name>
+	
+	<!-- Modules to build -->
+	<modules>
+		<module>org.eclipse.papyrus.bmm.diagram</module>
+		<module>org.eclipse.papyrus.bmm.diagram.common</module>
+		<module>org.eclipse.papyrus.bmm.diagram.ui</module>
+	</modules>
+	
 </project>
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/.classpath b/plugins/bmm/model/org.eclipse.papyrus.bmm/.classpath
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/.classpath
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/.classpath
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/.gitignore b/plugins/bmm/model/org.eclipse.papyrus.bmm/.gitignore
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/.gitignore
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/.gitignore
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/.project b/plugins/bmm/model/org.eclipse.papyrus.bmm/.project
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/.project
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/.project
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/.settings/org.eclipse.jdt.core.prefs b/plugins/bmm/model/org.eclipse.papyrus.bmm/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/.settings/org.eclipse.jdt.core.prefs
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/META-INF/MANIFEST.MF b/plugins/bmm/model/org.eclipse.papyrus.bmm/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/META-INF/MANIFEST.MF
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/META-INF/MANIFEST.MF
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/about.html b/plugins/bmm/model/org.eclipse.papyrus.bmm/about.html
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/about.html
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/about.html
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/build.properties b/plugins/bmm/model/org.eclipse.papyrus.bmm/build.properties
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/build.properties
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/build.properties
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/icons/bmm_16x16.png b/plugins/bmm/model/org.eclipse.papyrus.bmm/icons/bmm_16x16.png
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/icons/bmm_16x16.png
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/icons/bmm_16x16.png
Binary files differ
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/model/BMMProfile.ecore b/plugins/bmm/model/org.eclipse.papyrus.bmm/model/BMMProfile.ecore
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/model/BMMProfile.ecore
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/model/BMMProfile.ecore
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/model/Bmm.profile.di b/plugins/bmm/model/org.eclipse.papyrus.bmm/model/Bmm.profile.di
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/model/Bmm.profile.di
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/model/Bmm.profile.di
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/model/Bmm.profile.genmodel b/plugins/bmm/model/org.eclipse.papyrus.bmm/model/Bmm.profile.genmodel
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/model/Bmm.profile.genmodel
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/model/Bmm.profile.genmodel
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/model/Bmm.profile.notation b/plugins/bmm/model/org.eclipse.papyrus.bmm/model/Bmm.profile.notation
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/model/Bmm.profile.notation
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/model/Bmm.profile.notation
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/model/Bmm.profile.uml b/plugins/bmm/model/org.eclipse.papyrus.bmm/model/Bmm.profile.uml
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/model/Bmm.profile.uml
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/model/Bmm.profile.uml
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/plugin.properties b/plugins/bmm/model/org.eclipse.papyrus.bmm/plugin.properties
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/plugin.properties
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/plugin.properties
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/plugin.xml b/plugins/bmm/model/org.eclipse.papyrus.bmm/plugin.xml
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/plugin.xml
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/plugin.xml
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/pom.xml b/plugins/bmm/model/org.eclipse.papyrus.bmm/pom.xml
similarity index 93%
rename from plugins/bmm/org.eclipse.papyrus.bmm/pom.xml
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/pom.xml
index 1449f84..e703191 100644
--- a/plugins/bmm/org.eclipse.papyrus.bmm/pom.xml
+++ b/plugins/bmm/model/org.eclipse.papyrus.bmm/pom.xml
@@ -23,7 +23,7 @@
 	<!-- Parent POM (i.e., bundles POM) -->
 	<parent>
 		<groupId>org.eclipse.papyrus.requirements</groupId>
-		<artifactId>org.eclipse.papyrus.requirements.plugins.common.bmm</artifactId>
+		<artifactId>org.eclipse.papyrus.requirements.plugins.bmm.model</artifactId>
 		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 	
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/Bmm.ctx b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/Bmm.ctx
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/Bmm.ctx
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/Bmm.ctx
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessment.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessment.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessment.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessment.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentAffectsAchievementOfEnd.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentAffectsAchievementOfEnd.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentAffectsAchievementOfEnd.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentAffectsAchievementOfEnd.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentAffectsEmploymentOfMeans.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentAffectsEmploymentOfMeans.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentAffectsEmploymentOfMeans.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentAffectsEmploymentOfMeans.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentCategory.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentCategory.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentCategory.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentCategory.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentCategoryCategorizesAssessment.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentCategoryCategorizesAssessment.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentCategoryCategorizesAssessment.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentCategoryCategorizesAssessment.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentIdentifiesPotentialImpact.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentIdentifiesPotentialImpact.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentIdentifiesPotentialImpact.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentIdentifiesPotentialImpact.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentIsJudgmentOfInfluencer.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentIsJudgmentOfInfluencer.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentIsJudgmentOfInfluencer.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentIsJudgmentOfInfluencer.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentProvidesImpetusForDirective.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentProvidesImpetusForDirective.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentProvidesImpetusForDirective.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleAssessmentProvidesImpetusForDirective.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleAsset.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleAsset.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleAsset.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleAsset.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderAssessmentCategoryCategorizesNarrowerAssessmentCategory.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderAssessmentCategoryCategorizesNarrowerAssessmentCategory.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderAssessmentCategoryCategorizesNarrowerAssessmentCategory.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderAssessmentCategoryCategorizesNarrowerAssessmentCategory.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderBusinessPolicyIncludesMoreSpecificBusinessPolicy.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderBusinessPolicyIncludesMoreSpecificBusinessPolicy.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderBusinessPolicyIncludesMoreSpecificBusinessPolicy.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderBusinessPolicyIncludesMoreSpecificBusinessPolicy.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderCourseOfActionIncludesMoreSpecificCourseOfAction.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderCourseOfActionIncludesMoreSpecificCourseOfAction.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderCourseOfActionIncludesMoreSpecificCourseOfAction.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderCourseOfActionIncludesMoreSpecificCourseOfAction.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderDesiredCategoryCategorizesMoreSpecificDesiredResultCategory.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderDesiredCategoryCategorizesMoreSpecificDesiredResultCategory.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderDesiredCategoryCategorizesMoreSpecificDesiredResultCategory.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderDesiredCategoryCategorizesMoreSpecificDesiredResultCategory.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderDesiredResultIncludesMoreSpecificDesiredResult.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderDesiredResultIncludesMoreSpecificDesiredResult.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderDesiredResultIncludesMoreSpecificDesiredResult.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderDesiredResultIncludesMoreSpecificDesiredResult.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderInfluencerCategorizesNarrowerInfluencerCategory.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderInfluencerCategorizesNarrowerInfluencerCategory.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderInfluencerCategorizesNarrowerInfluencerCategory.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderInfluencerCategorizesNarrowerInfluencerCategory.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderOrganizationCategoryCategorizesNarrowerOrganizationCategory.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderOrganizationCategoryCategorizesNarrowerOrganizationCategory.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderOrganizationCategoryCategorizesNarrowerOrganizationCategory.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBroaderOrganizationCategoryCategorizesNarrowerOrganizationCategory.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessPolicy.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessPolicy.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessPolicy.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessPolicy.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessPolicyGovernsBusinessProcess.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessPolicyGovernsBusinessProcess.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessPolicyGovernsBusinessProcess.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessPolicyGovernsBusinessProcess.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessPolicyIsBasisOfBusinessRule.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessPolicyIsBasisOfBusinessRule.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessPolicyIsBasisOfBusinessRule.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessPolicyIsBasisOfBusinessRule.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessProcess.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessProcess.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessProcess.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessProcess.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessProcessDeliversOffering.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessProcessDeliversOffering.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessProcessDeliversOffering.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessProcessDeliversOffering.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessProcessManagesAsset.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessProcessManagesAsset.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessProcessManagesAsset.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessProcessManagesAsset.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessProcessRealizesCourseOfAction.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessProcessRealizesCourseOfAction.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessProcessRealizesCourseOfAction.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessProcessRealizesCourseOfAction.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessRule.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessRule.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessRule.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessRule.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessRuleGuidesBusinessProcess.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessRuleGuidesBusinessProcess.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessRuleGuidesBusinessProcess.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleBusinessRuleGuidesBusinessProcess.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfAction.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfAction.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfAction.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfAction.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfActionChannelsEffortsTowardsDesiredResult.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfActionChannelsEffortsTowardsDesiredResult.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfActionChannelsEffortsTowardsDesiredResult.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfActionChannelsEffortsTowardsDesiredResult.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfActionDefinesOffering.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfActionDefinesOffering.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfActionDefinesOffering.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfActionDefinesOffering.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfActionDeploysAsset.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfActionDeploysAsset.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfActionDeploysAsset.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfActionDeploysAsset.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfActionDischargesLiability.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfActionDischargesLiability.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfActionDischargesLiability.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfActionDischargesLiability.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfActionIsFormulatedBasedOnDirective.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfActionIsFormulatedBasedOnDirective.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfActionIsFormulatedBasedOnDirective.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleCourseOfActionIsFormulatedBasedOnDirective.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleDesiredResult.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleDesiredResult.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleDesiredResult.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleDesiredResult.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleDesiredResultCategory.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleDesiredResultCategory.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleDesiredResultCategory.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleDesiredResultCategory.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleDesiredResultCategoryCategorizesDesiredResult.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleDesiredResultCategoryCategorizesDesiredResult.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleDesiredResultCategoryCategorizesDesiredResult.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleDesiredResultCategoryCategorizesDesiredResult.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleDirective.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleDirective.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleDirective.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleDirective.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleDirectiveActsAsRegulation.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleDirectiveActsAsRegulation.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleDirectiveActsAsRegulation.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleDirectiveActsAsRegulation.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleDirectiveGovernsCourseOfAction.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleDirectiveGovernsCourseOfAction.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleDirectiveGovernsCourseOfAction.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleDirectiveGovernsCourseOfAction.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleDirectiveGovernsUseOfAsset.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleDirectiveGovernsUseOfAsset.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleDirectiveGovernsUseOfAsset.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleDirectiveGovernsUseOfAsset.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleDirectiveSupportsAchievementOfDesiredResult.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleDirectiveSupportsAchievementOfDesiredResult.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleDirectiveSupportsAchievementOfDesiredResult.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleDirectiveSupportsAchievementOfDesiredResult.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleEnablingCourseOfActionEnablesEnabledCourseOfAction.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleEnablingCourseOfActionEnablesEnabledCourseOfAction.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleEnablingCourseOfActionEnablesEnabledCourseOfAction.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleEnablingCourseOfActionEnablesEnabledCourseOfAction.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleEnd.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleEnd.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleEnd.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleEnd.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleExternalInfluencer.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleExternalInfluencer.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleExternalInfluencer.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleExternalInfluencer.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleFixedAsset.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleFixedAsset.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleFixedAsset.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleFixedAsset.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleFixedAssetProvidesResource.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleFixedAssetProvidesResource.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleFixedAssetProvidesResource.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleFixedAssetProvidesResource.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleGoal.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleGoal.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleGoal.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleGoal.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleGoalAmplifiesVision.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleGoalAmplifiesVision.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleGoalAmplifiesVision.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleGoalAmplifiesVision.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleInfluencer.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleInfluencer.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleInfluencer.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleInfluencer.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleInfluencerCategory.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleInfluencerCategory.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleInfluencerCategory.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleInfluencerCategory.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleInfluencerCategoryCategorizesInfluencer.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleInfluencerCategoryCategorizesInfluencer.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleInfluencerCategoryCategorizesInfluencer.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleInfluencerCategoryCategorizesInfluencer.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleInfluencingOrganization.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleInfluencingOrganization.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleInfluencingOrganization.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleInfluencingOrganization.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleInfluencingOrganizationIsSourceofInfluencer.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleInfluencingOrganizationIsSourceofInfluencer.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleInfluencingOrganizationIsSourceofInfluencer.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleInfluencingOrganizationIsSourceofInfluencer.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleInternalInfluencer.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleInternalInfluencer.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleInternalInfluencer.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleInternalInfluencer.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleLiability.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleLiability.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleLiability.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleLiability.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleLiabilityClaimsResource.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleLiabilityClaimsResource.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleLiabilityClaimsResource.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleLiabilityClaimsResource.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleMeans.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleMeans.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleMeans.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleMeans.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleMission.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleMission.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleMission.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleMission.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleMissionMakesOperativeVision.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleMissionMakesOperativeVision.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleMissionMakesOperativeVision.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleMissionMakesOperativeVision.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleMotivationEdge.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleMotivationEdge.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleMotivationEdge.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleMotivationEdge.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleMotivationElement.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleMotivationElement.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleMotivationElement.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleMotivationElement.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleObjective.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleObjective.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleObjective.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleObjective.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleObjectiveQuantitiesGoal.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleObjectiveQuantitiesGoal.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleObjectiveQuantitiesGoal.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleObjectiveQuantitiesGoal.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOffering.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOffering.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOffering.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOffering.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOfferingRequiresResource.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOfferingRequiresResource.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOfferingRequiresResource.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOfferingRequiresResource.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOfferingUsesFixedAsset.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOfferingUsesFixedAsset.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOfferingUsesFixedAsset.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOfferingUsesFixedAsset.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationCategory.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationCategory.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationCategory.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationCategory.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationCategoryCategorizesInfluencingOrganization.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationCategoryCategorizesInfluencingOrganization.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationCategoryCategorizesInfluencingOrganization.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationCategoryCategorizesInfluencingOrganization.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnit.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnit.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnit.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnit.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitActsAsInfluencingOrganization.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitActsAsInfluencingOrganization.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitActsAsInfluencingOrganization.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitActsAsInfluencingOrganization.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitDefinesEnd.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitDefinesEnd.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitDefinesEnd.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitDefinesEnd.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitEstablishesMeans.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitEstablishesMeans.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitEstablishesMeans.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitEstablishesMeans.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitIsResponsibleForAsset.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitIsResponsibleForAsset.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitIsResponsibleForAsset.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitIsResponsibleForAsset.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitIsResponsibleForBusinessProcess.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitIsResponsibleForBusinessProcess.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitIsResponsibleForBusinessProcess.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitIsResponsibleForBusinessProcess.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitIsResponsibleForLiability.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitIsResponsibleForLiability.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitIsResponsibleForLiability.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitIsResponsibleForLiability.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitMakesAssessment.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitMakesAssessment.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitMakesAssessment.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitMakesAssessment.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitRecognizesInfluencer.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitRecognizesInfluencer.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitRecognizesInfluencer.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleOrganizationUnitRecognizesInfluencer.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultiplePotentialImpact.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultiplePotentialImpact.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultiplePotentialImpact.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultiplePotentialImpact.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultiplePotentialImpactProvidesImpetursForDirective.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultiplePotentialImpactProvidesImpetursForDirective.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultiplePotentialImpactProvidesImpetursForDirective.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultiplePotentialImpactProvidesImpetursForDirective.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultiplePotentialReward.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultiplePotentialReward.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultiplePotentialReward.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultiplePotentialReward.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleRegulation.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleRegulation.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleRegulation.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleRegulation.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleResource.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleResource.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleResource.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleResource.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleRisk.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleRisk.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleRisk.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleRisk.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleStrategy.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleStrategy.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleStrategy.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleStrategy.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleStrategyDeterminesOrganizationUnit.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleStrategyDeterminesOrganizationUnit.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleStrategyDeterminesOrganizationUnit.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleStrategyDeterminesOrganizationUnit.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleStrategyIsAComponentfOfThe_PlanForMIssion.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleStrategyIsAComponentfOfThe_PlanForMIssion.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleStrategyIsAComponentfOfThe_PlanForMIssion.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleStrategyIsAComponentfOfThe_PlanForMIssion.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleTactic.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleTactic.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleTactic.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleTactic.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleTacticEffectsEnforcementLevelOfBusinessRule.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleTacticEffectsEnforcementLevelOfBusinessRule.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleTacticEffectsEnforcementLevelOfBusinessRule.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleTacticEffectsEnforcementLevelOfBusinessRule.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleTacticImplementsStrategy.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleTacticImplementsStrategy.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleTacticImplementsStrategy.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleTacticImplementsStrategy.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleUsingAssessmentUsesUsedAssessment.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleUsingAssessmentUsesUsedAssessment.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleUsingAssessmentUsesUsedAssessment.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleUsingAssessmentUsesUsedAssessment.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleVision.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleVision.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/MultipleVision.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/MultipleVision.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleAssessment.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleAssessment.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleAssessment.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleAssessment.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentAffectsAchievementOfEnd.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentAffectsAchievementOfEnd.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentAffectsAchievementOfEnd.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentAffectsAchievementOfEnd.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentAffectsEmploymentOfMeans.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentAffectsEmploymentOfMeans.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentAffectsEmploymentOfMeans.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentAffectsEmploymentOfMeans.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentCategory.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentCategory.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentCategory.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentCategory.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentCategoryCategorizesAssessment.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentCategoryCategorizesAssessment.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentCategoryCategorizesAssessment.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentCategoryCategorizesAssessment.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentIdentifiesPotentialImpact.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentIdentifiesPotentialImpact.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentIdentifiesPotentialImpact.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentIdentifiesPotentialImpact.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentIsJudgmentOfInfluencer.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentIsJudgmentOfInfluencer.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentIsJudgmentOfInfluencer.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentIsJudgmentOfInfluencer.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentProvidesImpetusForDirective.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentProvidesImpetusForDirective.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentProvidesImpetusForDirective.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleAssessmentProvidesImpetusForDirective.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleAsset.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleAsset.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleAsset.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleAsset.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderAssessmentCategoryCategorizesNarrowerAssessmentCategory.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderAssessmentCategoryCategorizesNarrowerAssessmentCategory.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderAssessmentCategoryCategorizesNarrowerAssessmentCategory.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderAssessmentCategoryCategorizesNarrowerAssessmentCategory.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderBusinessPolicyIncludesMoreSpecificBusinessPolicy.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderBusinessPolicyIncludesMoreSpecificBusinessPolicy.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderBusinessPolicyIncludesMoreSpecificBusinessPolicy.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderBusinessPolicyIncludesMoreSpecificBusinessPolicy.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderCourseOfActionIncludesMoreSpecificCourseOfAction.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderCourseOfActionIncludesMoreSpecificCourseOfAction.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderCourseOfActionIncludesMoreSpecificCourseOfAction.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderCourseOfActionIncludesMoreSpecificCourseOfAction.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderDesiredCategoryCategorizesMoreSpecificDesiredResultCategory.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderDesiredCategoryCategorizesMoreSpecificDesiredResultCategory.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderDesiredCategoryCategorizesMoreSpecificDesiredResultCategory.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderDesiredCategoryCategorizesMoreSpecificDesiredResultCategory.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderDesiredResultIncludesMoreSpecificDesiredResult.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderDesiredResultIncludesMoreSpecificDesiredResult.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderDesiredResultIncludesMoreSpecificDesiredResult.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderDesiredResultIncludesMoreSpecificDesiredResult.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderInfluencerCategorizesNarrowerInfluencerCategory.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderInfluencerCategorizesNarrowerInfluencerCategory.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderInfluencerCategorizesNarrowerInfluencerCategory.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderInfluencerCategorizesNarrowerInfluencerCategory.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderOrganizationCategoryCategorizesNarrowerOrganizationCategory.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderOrganizationCategoryCategorizesNarrowerOrganizationCategory.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderOrganizationCategoryCategorizesNarrowerOrganizationCategory.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBroaderOrganizationCategoryCategorizesNarrowerOrganizationCategory.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessPolicy.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessPolicy.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessPolicy.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessPolicy.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessPolicyGovernsBusinessProcess.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessPolicyGovernsBusinessProcess.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessPolicyGovernsBusinessProcess.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessPolicyGovernsBusinessProcess.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessPolicyIsBasisOfBusinessRule.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessPolicyIsBasisOfBusinessRule.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessPolicyIsBasisOfBusinessRule.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessPolicyIsBasisOfBusinessRule.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessProcess.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessProcess.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessProcess.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessProcess.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessProcessDeliversOffering.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessProcessDeliversOffering.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessProcessDeliversOffering.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessProcessDeliversOffering.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessProcessManagesAsset.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessProcessManagesAsset.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessProcessManagesAsset.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessProcessManagesAsset.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessProcessRealizesCourseOfAction.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessProcessRealizesCourseOfAction.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessProcessRealizesCourseOfAction.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessProcessRealizesCourseOfAction.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessRule.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessRule.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessRule.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessRule.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessRuleGuidesBusinessProcess.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessRuleGuidesBusinessProcess.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessRuleGuidesBusinessProcess.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleBusinessRuleGuidesBusinessProcess.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfAction.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfAction.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfAction.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfAction.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfActionChannelsEffortsTowardsDesiredResult.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfActionChannelsEffortsTowardsDesiredResult.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfActionChannelsEffortsTowardsDesiredResult.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfActionChannelsEffortsTowardsDesiredResult.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfActionDefinesOffering.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfActionDefinesOffering.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfActionDefinesOffering.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfActionDefinesOffering.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfActionDeploysAsset.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfActionDeploysAsset.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfActionDeploysAsset.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfActionDeploysAsset.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfActionDischargesLiability.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfActionDischargesLiability.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfActionDischargesLiability.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfActionDischargesLiability.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfActionIsFormulatedBasedOnDirective.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfActionIsFormulatedBasedOnDirective.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfActionIsFormulatedBasedOnDirective.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleCourseOfActionIsFormulatedBasedOnDirective.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleDesiredResult.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleDesiredResult.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleDesiredResult.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleDesiredResult.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleDesiredResultCategory.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleDesiredResultCategory.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleDesiredResultCategory.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleDesiredResultCategory.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleDesiredResultCategoryCategorizesDesiredResult.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleDesiredResultCategoryCategorizesDesiredResult.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleDesiredResultCategoryCategorizesDesiredResult.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleDesiredResultCategoryCategorizesDesiredResult.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleDirective.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleDirective.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleDirective.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleDirective.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleDirectiveActsAsRegulation.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleDirectiveActsAsRegulation.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleDirectiveActsAsRegulation.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleDirectiveActsAsRegulation.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleDirectiveGovernsCourseOfAction.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleDirectiveGovernsCourseOfAction.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleDirectiveGovernsCourseOfAction.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleDirectiveGovernsCourseOfAction.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleDirectiveGovernsUseOfAsset.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleDirectiveGovernsUseOfAsset.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleDirectiveGovernsUseOfAsset.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleDirectiveGovernsUseOfAsset.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleDirectiveSupportsAchievementOfDesiredResult.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleDirectiveSupportsAchievementOfDesiredResult.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleDirectiveSupportsAchievementOfDesiredResult.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleDirectiveSupportsAchievementOfDesiredResult.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleEnablingCourseOfActionEnablesEnabledCourseOfAction.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleEnablingCourseOfActionEnablesEnabledCourseOfAction.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleEnablingCourseOfActionEnablesEnabledCourseOfAction.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleEnablingCourseOfActionEnablesEnabledCourseOfAction.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleEnd.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleEnd.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleEnd.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleEnd.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleExternalInfluencer.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleExternalInfluencer.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleExternalInfluencer.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleExternalInfluencer.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleFixedAsset.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleFixedAsset.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleFixedAsset.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleFixedAsset.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleFixedAssetProvidesResource.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleFixedAssetProvidesResource.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleFixedAssetProvidesResource.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleFixedAssetProvidesResource.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleGoal.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleGoal.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleGoal.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleGoal.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleGoalAmplifiesVision.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleGoalAmplifiesVision.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleGoalAmplifiesVision.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleGoalAmplifiesVision.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleInfluencer.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleInfluencer.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleInfluencer.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleInfluencer.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleInfluencerCategory.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleInfluencerCategory.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleInfluencerCategory.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleInfluencerCategory.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleInfluencerCategoryCategorizesInfluencer.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleInfluencerCategoryCategorizesInfluencer.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleInfluencerCategoryCategorizesInfluencer.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleInfluencerCategoryCategorizesInfluencer.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleInfluencingOrganization.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleInfluencingOrganization.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleInfluencingOrganization.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleInfluencingOrganization.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleInfluencingOrganizationIsSourceofInfluencer.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleInfluencingOrganizationIsSourceofInfluencer.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleInfluencingOrganizationIsSourceofInfluencer.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleInfluencingOrganizationIsSourceofInfluencer.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleInternalInfluencer.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleInternalInfluencer.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleInternalInfluencer.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleInternalInfluencer.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleLiability.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleLiability.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleLiability.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleLiability.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleLiabilityClaimsResource.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleLiabilityClaimsResource.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleLiabilityClaimsResource.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleLiabilityClaimsResource.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleMeans.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleMeans.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleMeans.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleMeans.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleMission.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleMission.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleMission.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleMission.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleMissionMakesOperativeVision.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleMissionMakesOperativeVision.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleMissionMakesOperativeVision.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleMissionMakesOperativeVision.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleMotivationEdge.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleMotivationEdge.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleMotivationEdge.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleMotivationEdge.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleMotivationElement.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleMotivationElement.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleMotivationElement.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleMotivationElement.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleObjective.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleObjective.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleObjective.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleObjective.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleObjectiveQuantitiesGoal.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleObjectiveQuantitiesGoal.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleObjectiveQuantitiesGoal.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleObjectiveQuantitiesGoal.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOffering.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOffering.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOffering.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOffering.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOfferingRequiresResource.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOfferingRequiresResource.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOfferingRequiresResource.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOfferingRequiresResource.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOfferingUsesFixedAsset.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOfferingUsesFixedAsset.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOfferingUsesFixedAsset.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOfferingUsesFixedAsset.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationCategory.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationCategory.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationCategory.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationCategory.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationCategoryCategorizesInfluencingOrganization.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationCategoryCategorizesInfluencingOrganization.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationCategoryCategorizesInfluencingOrganization.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationCategoryCategorizesInfluencingOrganization.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnit.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnit.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnit.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnit.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitActsAsInfluencingOrganization.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitActsAsInfluencingOrganization.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitActsAsInfluencingOrganization.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitActsAsInfluencingOrganization.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitDefinesEnd.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitDefinesEnd.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitDefinesEnd.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitDefinesEnd.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitEstablishesMeans.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitEstablishesMeans.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitEstablishesMeans.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitEstablishesMeans.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitIsResponsibleForAsset.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitIsResponsibleForAsset.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitIsResponsibleForAsset.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitIsResponsibleForAsset.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitIsResponsibleForBusinessProcess.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitIsResponsibleForBusinessProcess.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitIsResponsibleForBusinessProcess.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitIsResponsibleForBusinessProcess.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitIsResponsibleForLiability.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitIsResponsibleForLiability.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitIsResponsibleForLiability.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitIsResponsibleForLiability.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitMakesAssessment.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitMakesAssessment.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitMakesAssessment.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitMakesAssessment.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitRecognizesInfluencer.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitRecognizesInfluencer.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitRecognizesInfluencer.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleOrganizationUnitRecognizesInfluencer.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SinglePotentialImpact.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SinglePotentialImpact.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SinglePotentialImpact.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SinglePotentialImpact.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SinglePotentialImpactProvidesImpetursForDirective.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SinglePotentialImpactProvidesImpetursForDirective.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SinglePotentialImpactProvidesImpetursForDirective.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SinglePotentialImpactProvidesImpetursForDirective.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SinglePotentialReward.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SinglePotentialReward.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SinglePotentialReward.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SinglePotentialReward.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleRegulation.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleRegulation.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleRegulation.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleRegulation.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleResource.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleResource.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleResource.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleResource.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleRisk.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleRisk.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleRisk.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleRisk.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleStrategy.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleStrategy.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleStrategy.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleStrategy.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleStrategyDeterminesOrganizationUnit.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleStrategyDeterminesOrganizationUnit.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleStrategyDeterminesOrganizationUnit.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleStrategyDeterminesOrganizationUnit.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleStrategyIsAComponentfOfThe_PlanForMIssion.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleStrategyIsAComponentfOfThe_PlanForMIssion.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleStrategyIsAComponentfOfThe_PlanForMIssion.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleStrategyIsAComponentfOfThe_PlanForMIssion.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleTactic.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleTactic.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleTactic.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleTactic.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleTacticEffectsEnforcementLevelOfBusinessRule.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleTacticEffectsEnforcementLevelOfBusinessRule.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleTacticEffectsEnforcementLevelOfBusinessRule.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleTacticEffectsEnforcementLevelOfBusinessRule.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleTacticImplementsStrategy.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleTacticImplementsStrategy.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleTacticImplementsStrategy.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleTacticImplementsStrategy.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleUsingAssessmentUsesUsedAssessment.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleUsingAssessmentUsesUsedAssessment.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleUsingAssessmentUsesUsedAssessment.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleUsingAssessmentUsesUsedAssessment.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleVision.xwt b/plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleVision.xwt
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/properties/ui/SingleVision.xwt
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/properties/ui/SingleVision.xwt
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/Activator.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/Activator.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/Activator.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/Activator.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Assessment.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Assessment.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Assessment.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Assessment.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentAffectsAchievementOfEnd.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentAffectsAchievementOfEnd.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentAffectsAchievementOfEnd.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentAffectsAchievementOfEnd.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentAffectsEmploymentOfMeans.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentAffectsEmploymentOfMeans.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentAffectsEmploymentOfMeans.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentAffectsEmploymentOfMeans.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentCategory.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentCategory.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentCategory.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentCategory.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentCategoryCategorizesAssessment.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentCategoryCategorizesAssessment.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentCategoryCategorizesAssessment.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentCategoryCategorizesAssessment.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentIdentifiesPotentialImpact.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentIdentifiesPotentialImpact.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentIdentifiesPotentialImpact.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentIdentifiesPotentialImpact.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentIsJudgmentOfInfluencer.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentIsJudgmentOfInfluencer.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentIsJudgmentOfInfluencer.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentIsJudgmentOfInfluencer.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentProvidesImpetusForDirective.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentProvidesImpetusForDirective.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentProvidesImpetusForDirective.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/AssessmentProvidesImpetusForDirective.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Asset.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Asset.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Asset.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Asset.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BmmFactory.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BmmFactory.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BmmFactory.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BmmFactory.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BmmPackage.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BmmPackage.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BmmPackage.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BmmPackage.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderAssessmentCategoryCategorizesNarrowerAssessmentCategory.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderAssessmentCategoryCategorizesNarrowerAssessmentCategory.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderAssessmentCategoryCategorizesNarrowerAssessmentCategory.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderAssessmentCategoryCategorizesNarrowerAssessmentCategory.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderBusinessPolicyIncludesMoreSpecificBusinessPolicy.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderBusinessPolicyIncludesMoreSpecificBusinessPolicy.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderBusinessPolicyIncludesMoreSpecificBusinessPolicy.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderBusinessPolicyIncludesMoreSpecificBusinessPolicy.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderCourseOfActionIncludesMoreSpecificCourseOfAction.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderCourseOfActionIncludesMoreSpecificCourseOfAction.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderCourseOfActionIncludesMoreSpecificCourseOfAction.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderCourseOfActionIncludesMoreSpecificCourseOfAction.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderDesiredCategoryCategorizesMoreSpecificDesiredResultCategory.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderDesiredCategoryCategorizesMoreSpecificDesiredResultCategory.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderDesiredCategoryCategorizesMoreSpecificDesiredResultCategory.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderDesiredCategoryCategorizesMoreSpecificDesiredResultCategory.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderDesiredResultIncludesMoreSpecificDesiredResult.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderDesiredResultIncludesMoreSpecificDesiredResult.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderDesiredResultIncludesMoreSpecificDesiredResult.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderDesiredResultIncludesMoreSpecificDesiredResult.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderInfluencerCategorizesNarrowerInfluencerCategory.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderInfluencerCategorizesNarrowerInfluencerCategory.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderInfluencerCategorizesNarrowerInfluencerCategory.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderInfluencerCategorizesNarrowerInfluencerCategory.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderOrganizationCategoryCategorizesNarrowerOrganizationCategory.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderOrganizationCategoryCategorizesNarrowerOrganizationCategory.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderOrganizationCategoryCategorizesNarrowerOrganizationCategory.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BroaderOrganizationCategoryCategorizesNarrowerOrganizationCategory.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessPolicy.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessPolicy.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessPolicy.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessPolicy.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessPolicyGovernsBusinessProcess.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessPolicyGovernsBusinessProcess.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessPolicyGovernsBusinessProcess.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessPolicyGovernsBusinessProcess.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessPolicyIsBasisOfBusinessRule.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessPolicyIsBasisOfBusinessRule.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessPolicyIsBasisOfBusinessRule.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessPolicyIsBasisOfBusinessRule.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessProcess.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessProcess.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessProcess.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessProcess.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessProcessDeliversOffering.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessProcessDeliversOffering.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessProcessDeliversOffering.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessProcessDeliversOffering.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessProcessManagesAsset.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessProcessManagesAsset.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessProcessManagesAsset.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessProcessManagesAsset.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessProcessRealizesCourseOfAction.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessProcessRealizesCourseOfAction.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessProcessRealizesCourseOfAction.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessProcessRealizesCourseOfAction.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessRule.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessRule.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessRule.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessRule.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessRuleGuidesBusinessProcess.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessRuleGuidesBusinessProcess.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessRuleGuidesBusinessProcess.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/BusinessRuleGuidesBusinessProcess.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfAction.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfAction.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfAction.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfAction.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfActionChannelsEffortsTowardsDesiredResult.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfActionChannelsEffortsTowardsDesiredResult.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfActionChannelsEffortsTowardsDesiredResult.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfActionChannelsEffortsTowardsDesiredResult.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfActionDefinesOffering.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfActionDefinesOffering.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfActionDefinesOffering.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfActionDefinesOffering.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfActionDeploysAsset.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfActionDeploysAsset.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfActionDeploysAsset.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfActionDeploysAsset.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfActionDischargesLiability.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfActionDischargesLiability.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfActionDischargesLiability.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfActionDischargesLiability.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfActionIsFormulatedBasedOnDirective.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfActionIsFormulatedBasedOnDirective.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfActionIsFormulatedBasedOnDirective.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/CourseOfActionIsFormulatedBasedOnDirective.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DesiredResult.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DesiredResult.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DesiredResult.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DesiredResult.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DesiredResultCategory.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DesiredResultCategory.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DesiredResultCategory.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DesiredResultCategory.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DesiredResultCategoryCategorizesDesiredResult.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DesiredResultCategoryCategorizesDesiredResult.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DesiredResultCategoryCategorizesDesiredResult.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DesiredResultCategoryCategorizesDesiredResult.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Directive.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Directive.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Directive.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Directive.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DirectiveActsAsRegulation.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DirectiveActsAsRegulation.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DirectiveActsAsRegulation.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DirectiveActsAsRegulation.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DirectiveGovernsCourseOfAction.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DirectiveGovernsCourseOfAction.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DirectiveGovernsCourseOfAction.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DirectiveGovernsCourseOfAction.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DirectiveGovernsUseOfAsset.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DirectiveGovernsUseOfAsset.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DirectiveGovernsUseOfAsset.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DirectiveGovernsUseOfAsset.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DirectiveSupportsAchievementOfDesiredResult.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DirectiveSupportsAchievementOfDesiredResult.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DirectiveSupportsAchievementOfDesiredResult.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/DirectiveSupportsAchievementOfDesiredResult.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/EnablingCourseOfActionEnablesEnabledCourseOfAction.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/EnablingCourseOfActionEnablesEnabledCourseOfAction.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/EnablingCourseOfActionEnablesEnabledCourseOfAction.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/EnablingCourseOfActionEnablesEnabledCourseOfAction.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/End.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/End.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/End.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/End.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/ExternalInfluencer.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/ExternalInfluencer.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/ExternalInfluencer.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/ExternalInfluencer.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/FixedAsset.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/FixedAsset.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/FixedAsset.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/FixedAsset.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/FixedAssetProvidesResource.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/FixedAssetProvidesResource.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/FixedAssetProvidesResource.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/FixedAssetProvidesResource.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Goal.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Goal.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Goal.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Goal.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/GoalAmplifiesVision.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/GoalAmplifiesVision.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/GoalAmplifiesVision.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/GoalAmplifiesVision.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Influencer.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Influencer.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Influencer.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Influencer.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/InfluencerCategory.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/InfluencerCategory.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/InfluencerCategory.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/InfluencerCategory.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/InfluencerCategoryCategorizesInfluencer.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/InfluencerCategoryCategorizesInfluencer.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/InfluencerCategoryCategorizesInfluencer.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/InfluencerCategoryCategorizesInfluencer.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/InfluencingOrganization.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/InfluencingOrganization.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/InfluencingOrganization.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/InfluencingOrganization.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/InfluencingOrganizationIsSourceofInfluencer.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/InfluencingOrganizationIsSourceofInfluencer.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/InfluencingOrganizationIsSourceofInfluencer.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/InfluencingOrganizationIsSourceofInfluencer.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/InternalInfluencer.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/InternalInfluencer.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/InternalInfluencer.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/InternalInfluencer.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Liability.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Liability.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Liability.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Liability.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/LiabilityClaimsResource.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/LiabilityClaimsResource.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/LiabilityClaimsResource.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/LiabilityClaimsResource.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Means.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Means.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Means.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Means.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Mission.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Mission.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Mission.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Mission.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/MissionMakesOperativeVision.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/MissionMakesOperativeVision.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/MissionMakesOperativeVision.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/MissionMakesOperativeVision.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/MotivationEdge.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/MotivationEdge.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/MotivationEdge.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/MotivationEdge.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/MotivationElement.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/MotivationElement.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/MotivationElement.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/MotivationElement.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Objective.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Objective.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Objective.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Objective.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/ObjectiveQuantitiesGoal.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/ObjectiveQuantitiesGoal.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/ObjectiveQuantitiesGoal.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/ObjectiveQuantitiesGoal.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Offering.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Offering.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Offering.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Offering.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OfferingRequiresResource.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OfferingRequiresResource.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OfferingRequiresResource.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OfferingRequiresResource.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OfferingUsesFixedAsset.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OfferingUsesFixedAsset.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OfferingUsesFixedAsset.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OfferingUsesFixedAsset.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationCategory.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationCategory.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationCategory.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationCategory.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationCategoryCategorizesInfluencingOrganization.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationCategoryCategorizesInfluencingOrganization.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationCategoryCategorizesInfluencingOrganization.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationCategoryCategorizesInfluencingOrganization.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnit.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnit.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnit.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnit.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitActsAsInfluencingOrganization.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitActsAsInfluencingOrganization.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitActsAsInfluencingOrganization.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitActsAsInfluencingOrganization.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitDefinesEnd.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitDefinesEnd.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitDefinesEnd.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitDefinesEnd.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitEstablishesMeans.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitEstablishesMeans.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitEstablishesMeans.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitEstablishesMeans.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitIsResponsibleForAsset.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitIsResponsibleForAsset.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitIsResponsibleForAsset.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitIsResponsibleForAsset.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitIsResponsibleForBusinessProcess.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitIsResponsibleForBusinessProcess.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitIsResponsibleForBusinessProcess.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitIsResponsibleForBusinessProcess.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitIsResponsibleForLiability.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitIsResponsibleForLiability.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitIsResponsibleForLiability.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitIsResponsibleForLiability.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitMakesAssessment.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitMakesAssessment.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitMakesAssessment.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitMakesAssessment.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitRecognizesInfluencer.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitRecognizesInfluencer.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitRecognizesInfluencer.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/OrganizationUnitRecognizesInfluencer.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/PotentialImpact.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/PotentialImpact.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/PotentialImpact.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/PotentialImpact.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/PotentialImpactProvidesImpetursForDirective.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/PotentialImpactProvidesImpetursForDirective.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/PotentialImpactProvidesImpetursForDirective.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/PotentialImpactProvidesImpetursForDirective.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/PotentialReward.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/PotentialReward.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/PotentialReward.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/PotentialReward.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Regulation.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Regulation.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Regulation.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Regulation.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Resource.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Resource.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Resource.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Resource.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Risk.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Risk.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Risk.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Risk.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Strategy.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Strategy.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Strategy.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Strategy.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/StrategyDeterminesOrganizationUnit.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/StrategyDeterminesOrganizationUnit.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/StrategyDeterminesOrganizationUnit.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/StrategyDeterminesOrganizationUnit.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/StrategyIsAComponentfOfThe_PlanForMIssion.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/StrategyIsAComponentfOfThe_PlanForMIssion.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/StrategyIsAComponentfOfThe_PlanForMIssion.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/StrategyIsAComponentfOfThe_PlanForMIssion.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Tactic.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Tactic.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Tactic.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Tactic.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/TacticEffectsEnforcementLevelOfBusinessRule.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/TacticEffectsEnforcementLevelOfBusinessRule.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/TacticEffectsEnforcementLevelOfBusinessRule.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/TacticEffectsEnforcementLevelOfBusinessRule.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/TacticImplementsStrategy.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/TacticImplementsStrategy.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/TacticImplementsStrategy.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/TacticImplementsStrategy.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/UsingAssessmentUsesUsedAssessment.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/UsingAssessmentUsesUsedAssessment.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/UsingAssessmentUsesUsedAssessment.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/UsingAssessmentUsesUsedAssessment.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Vision.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Vision.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Vision.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/Vision.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentAffectsAchievementOfEndImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentAffectsAchievementOfEndImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentAffectsAchievementOfEndImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentAffectsAchievementOfEndImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentAffectsEmploymentOfMeansImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentAffectsEmploymentOfMeansImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentAffectsEmploymentOfMeansImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentAffectsEmploymentOfMeansImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentCategoryCategorizesAssessmentImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentCategoryCategorizesAssessmentImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentCategoryCategorizesAssessmentImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentCategoryCategorizesAssessmentImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentCategoryImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentCategoryImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentCategoryImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentCategoryImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentIdentifiesPotentialImpactImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentIdentifiesPotentialImpactImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentIdentifiesPotentialImpactImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentIdentifiesPotentialImpactImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentIsJudgmentOfInfluencerImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentIsJudgmentOfInfluencerImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentIsJudgmentOfInfluencerImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentIsJudgmentOfInfluencerImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentProvidesImpetusForDirectiveImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentProvidesImpetusForDirectiveImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentProvidesImpetusForDirectiveImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssessmentProvidesImpetusForDirectiveImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssetImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssetImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssetImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/AssetImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BmmFactoryImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BmmFactoryImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BmmFactoryImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BmmFactoryImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BmmPackageImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BmmPackageImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BmmPackageImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BmmPackageImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderAssessmentCategoryCategorizesNarrowerAssessmentCategoryImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderAssessmentCategoryCategorizesNarrowerAssessmentCategoryImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderAssessmentCategoryCategorizesNarrowerAssessmentCategoryImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderAssessmentCategoryCategorizesNarrowerAssessmentCategoryImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderBusinessPolicyIncludesMoreSpecificBusinessPolicyImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderBusinessPolicyIncludesMoreSpecificBusinessPolicyImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderBusinessPolicyIncludesMoreSpecificBusinessPolicyImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderBusinessPolicyIncludesMoreSpecificBusinessPolicyImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderCourseOfActionIncludesMoreSpecificCourseOfActionImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderCourseOfActionIncludesMoreSpecificCourseOfActionImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderCourseOfActionIncludesMoreSpecificCourseOfActionImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderCourseOfActionIncludesMoreSpecificCourseOfActionImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderDesiredCategoryCategorizesMoreSpecificDesiredResultCategoryImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderDesiredCategoryCategorizesMoreSpecificDesiredResultCategoryImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderDesiredCategoryCategorizesMoreSpecificDesiredResultCategoryImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderDesiredCategoryCategorizesMoreSpecificDesiredResultCategoryImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderDesiredResultIncludesMoreSpecificDesiredResultImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderDesiredResultIncludesMoreSpecificDesiredResultImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderDesiredResultIncludesMoreSpecificDesiredResultImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderDesiredResultIncludesMoreSpecificDesiredResultImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderInfluencerCategorizesNarrowerInfluencerCategoryImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderInfluencerCategorizesNarrowerInfluencerCategoryImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderInfluencerCategorizesNarrowerInfluencerCategoryImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderInfluencerCategorizesNarrowerInfluencerCategoryImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderOrganizationCategoryCategorizesNarrowerOrganizationCategoryImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderOrganizationCategoryCategorizesNarrowerOrganizationCategoryImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderOrganizationCategoryCategorizesNarrowerOrganizationCategoryImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BroaderOrganizationCategoryCategorizesNarrowerOrganizationCategoryImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessPolicyGovernsBusinessProcessImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessPolicyGovernsBusinessProcessImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessPolicyGovernsBusinessProcessImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessPolicyGovernsBusinessProcessImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessPolicyImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessPolicyImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessPolicyImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessPolicyImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessPolicyIsBasisOfBusinessRuleImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessPolicyIsBasisOfBusinessRuleImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessPolicyIsBasisOfBusinessRuleImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessPolicyIsBasisOfBusinessRuleImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessProcessDeliversOfferingImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessProcessDeliversOfferingImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessProcessDeliversOfferingImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessProcessDeliversOfferingImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessProcessImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessProcessImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessProcessImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessProcessImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessProcessManagesAssetImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessProcessManagesAssetImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessProcessManagesAssetImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessProcessManagesAssetImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessProcessRealizesCourseOfActionImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessProcessRealizesCourseOfActionImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessProcessRealizesCourseOfActionImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessProcessRealizesCourseOfActionImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessRuleGuidesBusinessProcessImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessRuleGuidesBusinessProcessImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessRuleGuidesBusinessProcessImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessRuleGuidesBusinessProcessImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessRuleImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessRuleImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessRuleImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/BusinessRuleImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionChannelsEffortsTowardsDesiredResultImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionChannelsEffortsTowardsDesiredResultImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionChannelsEffortsTowardsDesiredResultImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionChannelsEffortsTowardsDesiredResultImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionDefinesOfferingImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionDefinesOfferingImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionDefinesOfferingImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionDefinesOfferingImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionDeploysAssetImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionDeploysAssetImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionDeploysAssetImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionDeploysAssetImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionDischargesLiabilityImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionDischargesLiabilityImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionDischargesLiabilityImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionDischargesLiabilityImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionIsFormulatedBasedOnDirectiveImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionIsFormulatedBasedOnDirectiveImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionIsFormulatedBasedOnDirectiveImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/CourseOfActionIsFormulatedBasedOnDirectiveImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DesiredResultCategoryCategorizesDesiredResultImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DesiredResultCategoryCategorizesDesiredResultImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DesiredResultCategoryCategorizesDesiredResultImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DesiredResultCategoryCategorizesDesiredResultImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DesiredResultCategoryImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DesiredResultCategoryImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DesiredResultCategoryImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DesiredResultCategoryImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DesiredResultImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DesiredResultImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DesiredResultImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DesiredResultImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DirectiveActsAsRegulationImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DirectiveActsAsRegulationImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DirectiveActsAsRegulationImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DirectiveActsAsRegulationImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DirectiveGovernsCourseOfActionImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DirectiveGovernsCourseOfActionImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DirectiveGovernsCourseOfActionImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DirectiveGovernsCourseOfActionImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DirectiveGovernsUseOfAssetImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DirectiveGovernsUseOfAssetImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DirectiveGovernsUseOfAssetImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DirectiveGovernsUseOfAssetImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DirectiveImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DirectiveImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DirectiveImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DirectiveImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DirectiveSupportsAchievementOfDesiredResultImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DirectiveSupportsAchievementOfDesiredResultImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DirectiveSupportsAchievementOfDesiredResultImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/DirectiveSupportsAchievementOfDesiredResultImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/EnablingCourseOfActionEnablesEnabledCourseOfActionImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/EnablingCourseOfActionEnablesEnabledCourseOfActionImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/EnablingCourseOfActionEnablesEnabledCourseOfActionImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/EnablingCourseOfActionEnablesEnabledCourseOfActionImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/EndImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/EndImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/EndImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/EndImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/ExternalInfluencerImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/ExternalInfluencerImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/ExternalInfluencerImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/ExternalInfluencerImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/FixedAssetImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/FixedAssetImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/FixedAssetImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/FixedAssetImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/FixedAssetProvidesResourceImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/FixedAssetProvidesResourceImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/FixedAssetProvidesResourceImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/FixedAssetProvidesResourceImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/GoalAmplifiesVisionImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/GoalAmplifiesVisionImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/GoalAmplifiesVisionImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/GoalAmplifiesVisionImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/GoalImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/GoalImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/GoalImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/GoalImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InfluencerCategoryCategorizesInfluencerImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InfluencerCategoryCategorizesInfluencerImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InfluencerCategoryCategorizesInfluencerImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InfluencerCategoryCategorizesInfluencerImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InfluencerCategoryImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InfluencerCategoryImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InfluencerCategoryImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InfluencerCategoryImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InfluencerImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InfluencerImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InfluencerImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InfluencerImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InfluencingOrganizationImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InfluencingOrganizationImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InfluencingOrganizationImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InfluencingOrganizationImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InfluencingOrganizationIsSourceofInfluencerImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InfluencingOrganizationIsSourceofInfluencerImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InfluencingOrganizationIsSourceofInfluencerImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InfluencingOrganizationIsSourceofInfluencerImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InternalInfluencerImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InternalInfluencerImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InternalInfluencerImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/InternalInfluencerImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/LiabilityClaimsResourceImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/LiabilityClaimsResourceImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/LiabilityClaimsResourceImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/LiabilityClaimsResourceImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/LiabilityImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/LiabilityImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/LiabilityImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/LiabilityImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/MeansImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/MeansImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/MeansImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/MeansImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/MissionImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/MissionImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/MissionImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/MissionImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/MissionMakesOperativeVisionImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/MissionMakesOperativeVisionImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/MissionMakesOperativeVisionImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/MissionMakesOperativeVisionImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/MotivationEdgeImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/MotivationEdgeImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/MotivationEdgeImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/MotivationEdgeImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/MotivationElementImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/MotivationElementImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/MotivationElementImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/MotivationElementImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/ObjectiveImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/ObjectiveImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/ObjectiveImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/ObjectiveImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/ObjectiveQuantitiesGoalImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/ObjectiveQuantitiesGoalImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/ObjectiveQuantitiesGoalImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/ObjectiveQuantitiesGoalImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OfferingImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OfferingImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OfferingImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OfferingImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OfferingRequiresResourceImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OfferingRequiresResourceImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OfferingRequiresResourceImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OfferingRequiresResourceImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OfferingUsesFixedAssetImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OfferingUsesFixedAssetImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OfferingUsesFixedAssetImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OfferingUsesFixedAssetImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationCategoryCategorizesInfluencingOrganizationImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationCategoryCategorizesInfluencingOrganizationImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationCategoryCategorizesInfluencingOrganizationImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationCategoryCategorizesInfluencingOrganizationImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationCategoryImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationCategoryImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationCategoryImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationCategoryImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitActsAsInfluencingOrganizationImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitActsAsInfluencingOrganizationImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitActsAsInfluencingOrganizationImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitActsAsInfluencingOrganizationImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitDefinesEndImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitDefinesEndImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitDefinesEndImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitDefinesEndImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitEstablishesMeansImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitEstablishesMeansImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitEstablishesMeansImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitEstablishesMeansImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitIsResponsibleForAssetImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitIsResponsibleForAssetImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitIsResponsibleForAssetImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitIsResponsibleForAssetImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitIsResponsibleForBusinessProcessImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitIsResponsibleForBusinessProcessImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitIsResponsibleForBusinessProcessImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitIsResponsibleForBusinessProcessImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitIsResponsibleForLiabilityImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitIsResponsibleForLiabilityImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitIsResponsibleForLiabilityImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitIsResponsibleForLiabilityImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitMakesAssessmentImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitMakesAssessmentImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitMakesAssessmentImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitMakesAssessmentImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitRecognizesInfluencerImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitRecognizesInfluencerImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitRecognizesInfluencerImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/OrganizationUnitRecognizesInfluencerImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/PotentialImpactImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/PotentialImpactImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/PotentialImpactImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/PotentialImpactImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/PotentialImpactProvidesImpetursForDirectiveImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/PotentialImpactProvidesImpetursForDirectiveImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/PotentialImpactProvidesImpetursForDirectiveImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/PotentialImpactProvidesImpetursForDirectiveImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/PotentialRewardImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/PotentialRewardImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/PotentialRewardImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/PotentialRewardImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/RegulationImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/RegulationImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/RegulationImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/RegulationImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/ResourceImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/ResourceImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/ResourceImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/ResourceImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/RiskImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/RiskImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/RiskImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/RiskImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/StrategyDeterminesOrganizationUnitImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/StrategyDeterminesOrganizationUnitImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/StrategyDeterminesOrganizationUnitImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/StrategyDeterminesOrganizationUnitImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/StrategyImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/StrategyImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/StrategyImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/StrategyImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/StrategyIsAComponentfOfThe_PlanForMIssionImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/StrategyIsAComponentfOfThe_PlanForMIssionImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/StrategyIsAComponentfOfThe_PlanForMIssionImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/StrategyIsAComponentfOfThe_PlanForMIssionImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/TacticEffectsEnforcementLevelOfBusinessRuleImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/TacticEffectsEnforcementLevelOfBusinessRuleImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/TacticEffectsEnforcementLevelOfBusinessRuleImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/TacticEffectsEnforcementLevelOfBusinessRuleImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/TacticImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/TacticImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/TacticImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/TacticImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/TacticImplementsStrategyImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/TacticImplementsStrategyImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/TacticImplementsStrategyImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/TacticImplementsStrategyImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/UsingAssessmentUsesUsedAssessmentImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/UsingAssessmentUsesUsedAssessmentImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/UsingAssessmentUsesUsedAssessmentImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/UsingAssessmentUsesUsedAssessmentImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/VisionImpl.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/VisionImpl.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/VisionImpl.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/impl/VisionImpl.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/util/BmmAdapterFactory.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/util/BmmAdapterFactory.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/util/BmmAdapterFactory.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/util/BmmAdapterFactory.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/util/BmmSwitch.java b/plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/util/BmmSwitch.java
similarity index 100%
rename from plugins/bmm/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/util/BmmSwitch.java
rename to plugins/bmm/model/org.eclipse.papyrus.bmm/src/org/eclipse/papyrus/bmm/BMMProfile/util/BmmSwitch.java
diff --git a/plugins/bmm/org.eclipse.papyrus.bmm/pom.xml b/plugins/bmm/model/pom.xml
similarity index 77%
copy from plugins/bmm/org.eclipse.papyrus.bmm/pom.xml
copy to plugins/bmm/model/pom.xml
index 1449f84..b2da3b7 100644
--- a/plugins/bmm/org.eclipse.papyrus.bmm/pom.xml
+++ b/plugins/bmm/model/pom.xml
@@ -23,13 +23,18 @@
 	<!-- Parent POM (i.e., bundles POM) -->
 	<parent>
 		<groupId>org.eclipse.papyrus.requirements</groupId>
-		<artifactId>org.eclipse.papyrus.requirements.plugins.common.bmm</artifactId>
+		<artifactId>org.eclipse.papyrus.requirements.plugins.bmm</artifactId>
 		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 	
 	<!-- POM Description -->
-	<artifactId>org.eclipse.papyrus.bmm</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>0.7.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
+	<artifactId>org.eclipse.papyrus.requirements.plugins.bmm.model</artifactId>
+	<packaging>pom</packaging>
+	<name>BMM model</name>
+	
+	<!-- Modules to build -->
+	<modules>
+		<module>org.eclipse.papyrus.bmm</module>
+	</modules>
+	
 </project>
diff --git a/plugins/bmm/pom.xml b/plugins/bmm/pom.xml
index b7f667a..9f0ac2d 100644
--- a/plugins/bmm/pom.xml
+++ b/plugins/bmm/pom.xml
@@ -28,17 +28,14 @@
 	</parent>
 	
 	<!-- POM Description -->
-	<artifactId>org.eclipse.papyrus.requirements.plugins.common.bmm</artifactId>
+	<artifactId>org.eclipse.papyrus.requirements.plugins.bmm</artifactId>
 	<packaging>pom</packaging>
-	<name>Requirements bmm</name>
+	<name>BMM</name>
 	
 	<!-- Modules to build -->
 	<modules>
-		<module>org.eclipse.papyrus.bmm</module>
-		<module>org.eclipse.papyrus.bmm.diagram</module>
-		<module>org.eclipse.papyrus.bmm.diagram.common</module>
-		<module>org.eclipse.papyrus.bmm.diagram.ui</module>
-		<module>org.eclipse.papyrus.bmm.examples</module>
+		<module>model</module>
+		<module>gui</module>
 	</modules>
 	
 </project>