diff --git a/org.eclipse.papyrus.bpmn.diagram.collaboration/META-INF/MANIFEST.MF b/org.eclipse.papyrus.bpmn.diagram.collaboration/META-INF/MANIFEST.MF
index 4d28363..e24b8b0 100755
--- a/org.eclipse.papyrus.bpmn.diagram.collaboration/META-INF/MANIFEST.MF
+++ b/org.eclipse.papyrus.bpmn.diagram.collaboration/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@
  org.eclipse.core.runtime,
  org.eclipse.papyrus.bpmn;bundle-version="0.7.0",
  org.eclipse.papyrus.bpmn.diagram.common;bundle-version="0.7.0",
- org.eclipse.papyrus.bpmn.diagram.ui;bundle-version="0.7.0",
  org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.gmf.runtime.notation.edit,
  org.eclipse.gmf.runtime.diagram.core,
diff --git a/org.eclipse.papyrus.bpmn.diagram.collaboration/src/org/eclipse/papyrus/bpmn/diagram/collaboration/ActivityViewFactory.java b/org.eclipse.papyrus.bpmn.diagram.collaboration/src/org/eclipse/papyrus/bpmn/diagram/collaboration/ActivityViewFactory.java
index acd1eef..3da6277 100755
--- a/org.eclipse.papyrus.bpmn.diagram.collaboration/src/org/eclipse/papyrus/bpmn/diagram/collaboration/ActivityViewFactory.java
+++ b/org.eclipse.papyrus.bpmn.diagram.collaboration/src/org/eclipse/papyrus/bpmn/diagram/collaboration/ActivityViewFactory.java
@@ -33,8 +33,6 @@
 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
 		node.setType("2001");
 		// initializeFromPreferences
-		Node label5001 = createLabel(node, UMLVisualIDRegistry.getType(ActivityNameEditPart.VISUAL_ID));
-		Node label5002 = createLabel(node, UMLVisualIDRegistry.getType(ActivityIsSingleExecutionEditPart.VISUAL_ID));
 		createCompartment(node, UMLVisualIDRegistry.getType(ActivityActivityParametersCompartmentEditPart.VISUAL_ID), false, false, true, true);
 		createCompartment(node, UMLVisualIDRegistry.getType(ActivityActivityPreConditionsCompartmentEditPart.VISUAL_ID), false, false, true, true);
 		createCompartment(node, UMLVisualIDRegistry.getType(ActivityActivityPostConditionsCompartmentEditPart.VISUAL_ID), false, false, true, true);
diff --git a/org.eclipse.papyrus.bpmn.diagram.common/OSGI-INF/l10n/bundle.properties b/org.eclipse.papyrus.bpmn.diagram.common/OSGI-INF/l10n/bundle.properties
index b39db60..d618784 100644
--- a/org.eclipse.papyrus.bpmn.diagram.common/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.papyrus.bpmn.diagram.common/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,4 @@
 #Properties file for org.eclipse.papyrus.bpmn.diagram.collaboration
 Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = Common plugin for Papyrus BPMN
\ No newline at end of file
+Bundle-Name = BPMN Common UI plugin
+extension.name = New BPMN Child
\ No newline at end of file
diff --git a/org.eclipse.papyrus.bpmn.diagram.common/build.properties b/org.eclipse.papyrus.bpmn.diagram.common/build.properties
index 08d1352..bdf977b 100755
--- a/org.eclipse.papyrus.bpmn.diagram.common/build.properties
+++ b/org.eclipse.papyrus.bpmn.diagram.common/build.properties
@@ -4,11 +4,10 @@
                .,\
                plugin.xml,\
                icons/,\
-               build.properties,\
                about.html,\
-               diagrams/,\
                css/,\
                shapes/,\
                model/,\
-               OSGI-INF/
+               OSGI-INF/,\
+               resources/
 src.includes = about.html
diff --git a/org.eclipse.papyrus.bpmn.diagram.common/css/style.css b/org.eclipse.papyrus.bpmn.diagram.common/css/style.css
index 42a281f..b0c84c8 100755
--- a/org.eclipse.papyrus.bpmn.diagram.common/css/style.css
+++ b/org.eclipse.papyrus.bpmn.diagram.common/css/style.css
@@ -19,14 +19,6 @@
 	visible:false;
 }
 
-/*
-OpaqueAction{
-	rightMarginLabel : 2;
-	leftMarginLabel : 30;
-    topMarginLabel : 10;
-    isNameWrap : true;
-}
-*/
 [appliedStereotypes~="BPMNProfile::Task"] > Compartment[kind="symbol"] {
 	visible:false;
 }
@@ -36,23 +28,11 @@
 }
 
 
-* > Compartment[kind="symbol"] {
-	visible:true;
-}
-
 * > Label[type=StereotypeLabel] {
 	visible:false;
 	displayTags: false;
 }
 
-* {
-	followSVGSymbol: true;
-	svgCSSFile: url('platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/css/alternateBorderColor.css');
-	elementIcon : false;
-	displayTags :false;
-}
-
-
 [appliedStereotypes~="BPMNProfile::Task"]
 {
 	fillColor: white;
@@ -85,6 +65,7 @@
 
 [appliedStereotypes~="BPMNProfile::ManualTask"]{
 	leftMarginLabel : 30;
+	rightMarginLabel : 2;
 	fillColor: white;
 	displayTags: false;
 	svgFile: "platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/shapes/ManualTask.svg";
@@ -97,6 +78,7 @@
 
 [appliedStereotypes~="BPMNProfile::ReceiveTask"]{
 	leftMarginLabel : 30;
+	rightMarginLabel : 2;
 	fillColor: white;
 	displayTags: false;
 	svgFile: "platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/shapes/ReceiveTask.svg";
@@ -105,44 +87,68 @@
 
 [appliedStereotypes~="BPMNProfile::UserTask"]{
 	leftMarginLabel : 30;
+	rightMarginLabel : 2;
 	fillColor: white;
 	displayTags: false;
 	svgFile: "platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/shapes/UserTask.svg";
 	shapeVisibility: true;
 }
 
+[appliedStereotypes~="BPMNProfile::UserTask"] > Compartment[kind="symbol"] {
+	visible:false;
+}
+
 [appliedStereotypes~="BPMNProfile::ScriptTask"]{
 	leftMarginLabel : 30;
+	rightMarginLabel : 2;
 	fillColor: white;
 	displayTags: false;
 	svgFile: "platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/shapes/ScriptTask.svg";
 	shapeVisibility: true;
 }
 
+[appliedStereotypes~="BPMNProfile::ScriptTask"] > Compartment[kind="symbol"] {
+	visible:false;
+}
+
 [appliedStereotypes~="BPMNProfile::BusinessRuleTask"]{
 	leftMarginLabel : 30;
+	rightMarginLabel : 2;
 	fillColor: white;
 	displayTags: false;
 	svgFile: "platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/shapes/BusinessRuleTask.svg";
 	shapeVisibility: true;
 }
 
+[appliedStereotypes~="BPMNProfile::BusinessRuleTask"] > Compartment[kind="symbol"] {
+	visible:false;
+}
+
 [appliedStereotypes~="BPMNProfile::SendTask"]{
-	leftMarginLabel : 30;
+	leftMarginLabel : 34;
+	rightMarginLabel : 2;
 	fillColor: white;
 	displayTags: false;
 	svgFile: "platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/shapes/SendTask.svg";
 	shapeVisibility: true;
 }
 
+[appliedStereotypes~="BPMNProfile::SendTask"] > Compartment[kind="symbol"] {
+	visible:false;
+}
+
 [appliedStereotypes~="BPMNProfile::ServiceTask"]{
-	leftMarginLabel : 30;
+	leftMarginLabel : 34;
+	rightMarginLabel : 2;
 	fillColor: white;
 	displayTags: false;
 	svgFile: "platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/shapes/ServiceTask.svg";
 	shapeVisibility: true;
 }
 
+[appliedStereotypes~="BPMNProfile::ServiceTask"] > Compartment[kind="symbol"] {
+	visible:false;
+}
 
 [appliedStereotypes~="BPMNProfile::Task"] > Compartment[kind="symbol"] {
 	visible:false;
@@ -154,19 +160,51 @@
 	followSVGSymbol: true;
 	displayTags: false;
 	displayName : false;
+	maintainSymbolRatio:true;
+	maskLabel: stereotypeName;
+}
+
+[appliedStereotypes~="BPMNProfile::ParallelGateway"] > Compartment[kind="symbol"] {
+	visible:true;
 }
 
 [appliedStereotypes~="BPMNProfile::ExclusiveGateway"]{
 	svgFile: "platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/shapes/ExclusiveGateway.svg";
 	transparency: 100;
 	followSVGSymbol: true;
+	displayTags: false;
+	displayName : false;
+	maintainSymbolRatio:true;
+}
+
+[appliedStereotypes~="BPMNProfile::ExclusiveGateway"] > Compartment[kind="symbol"] {
+	visible:true;
 }
 
 [appliedStereotypes~="BPMNProfile::InclusiveGateway"]{
 	svgFile: "platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/shapes/InclusiveGateway.svg";
 	transparency: 100;
 	followSVGSymbol: true;
+	displayTags: false;
 	displayName: false;
+	maintainSymbolRatio:true;
+}
+
+[appliedStereotypes~="BPMNProfile::InclusiveGateway"] > Compartment[kind="symbol"] {
+	visible:true;
+}
+
+[appliedStereotypes~="BPMNProfile::EventBasedGateway"]{
+	svgFile: "platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/shapes/EventBasedGateway.svg";
+	transparency: 100;
+	followSVGSymbol: true;
+	displayTags: false;
+	displayName: false;
+	maintainSymbolRatio:true;
+}
+
+[appliedStereotypes~="BPMNProfile::EventBasedGateway"] > Compartment[kind="symbol"] {
+	visible:true;
 }
 
 [appliedStereotypes~="BPMNProfile::StartEvent"]{
@@ -226,23 +264,24 @@
 	maintainSymbolRatio: true;
 }
 
-[appliedStereotypes~="BPMNProfile::EventBasedGateway"]{
-	svgFile: "platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/shapes/EventBasedGateway.svg";
-	transparency: 100;
-}
-
 [appliedStereotypes~="BPMNProfile::SequenceFlow"]{
 	displayName: false;
 }
 
 [appliedStereotypes~="BPMNProfile::DataStoreReference"]{
 	svgFile: "platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/shapes/DataStore.svg";
-	transparency: 0;
+	transparency: 100;
 	displayTags: false;
 	followSVGSymbol: true;
+	topMarginLabel:2;
+	bottomMarginLabel:2;
 
 }
 
+[appliedStereotypes~="BPMNProfile::DataStoreReference"] > Compartment[kind="symbol"] {
+	visible:true;
+}
+
 alternateBorderColor path{
 	stroke: red;
 }
@@ -258,31 +297,7 @@
 	svgCSSClass: alternateBorderColor;
 
 }
-/*
 
-[appliedStereotypes~="BPMNProfile::DataStoreReference"][name="20"]{
-/*
- *
-svgFile: "platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/shapes/DataStore20.svg";
-transparency: 100;
-displayTags: false;
-maskLabel: stereotypeName;
-svgCSSClass: alternateBorderColor;
-}
-
-[appliedStereotypes~="BPMNProfile::DataStoreReference"][name="100"]{
-/*
- *
-svgFile: "platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/shapes/DataStore100.svg";
-
-transparency: 100;
-displayTags: false;
-maskLabel: stereotypeName;
-svgCSSClass: alternateBorderColor;
-}
-/*
-*
-*/
 
 
 [appliedStereotypes~="BPMNProfile::DataStoreReference"] > Label:stereotype {
@@ -296,82 +311,25 @@
 	visible: false;
 }
 
-[appliedStereotypes~="BPMNProfile::IntermediateThrowEvent"]{
-	svgFile: "platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/shapes/IntermediateEvent.svg";
-	transparency: 100;
-	maintainSymbolRatio: false;
-	displayName: true;
-}
-
-[appliedStereotypes~="BPMNProfile::IntermediateThrowEvent"] > Label:name{
-	visible: true;
-}
-
 [appliedStereotypes~="BPMNProfile::DataObject"]{
 	svgFile: "platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/shapes/DataObject.svg";
 	transparency: 100;
 	maintainSymbolRatio: true;
 	displayTags: false;
-}
-
-[appliedStereotypes~="BPMNProfile::DataStoreReference"]{
-	svgFile: "platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/shapes/DataStore.svg";
-	transparency: 100;
-	displayTags: false;
+	topMarginLabel:2;
+	bottomMarginLabel:2;
 	followSVGSymbol: true;
-
 }
 
+[appliedStereotypes~="BPMNProfile::DataObject"] > Compartment[kind="symbol"] {
+	visible:true;
+}
+
+
 [appliedStereotypes~="BPMNProfile::ManualTask"][name="10"]{
 	lineColor: red;
 }
 
-
-alternateBorderColor path{
-	stroke: red;
-}
-
-[appliedStereotypes~="BPMNProfile::DataStoreReference"][name="10"]{
-	/*
-	svgFile: "platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/shapes/DataStore10.svg";
-	 * */
-
-	transparency: 100;
-	displayTags: false;
-	maskLabel: stereotypeName;
-	svgCSSClass: alternateBorderColor;
-
-}
-/*
-
-[appliedStereotypes~="BPMNProfile::DataStoreReference"][name="20"]{
-/*
- *
-svgFile: "platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/shapes/DataStore20.svg";
-transparency: 100;
-displayTags: false;
-maskLabel: stereotypeName;
-svgCSSClass: alternateBorderColor;
-}
-
-[appliedStereotypes~="BPMNProfile::DataStoreReference"][name="100"]{
-/*
- *
-svgFile: "platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/shapes/DataStore100.svg";
-transparency: 100;
-displayTags: false;
-maskLabel: stereotypeName;
-svgCSSClass: alternateBorderColor;
-}
-/*
-*
-*/
-
-
-[appliedStereotypes~="BPMNProfile::DataStoreReference"] > Label:stereotype {
-	visible:false;
-}
-
 [appliedStereotypes~="BPMNProfile::Task"] > Label:stereotype {
 	visible:false;
 }
@@ -422,4 +380,4 @@
 
 [appliedStereotypes~="BPMNProfile::EndEvent"] > Label{
 	visible:false;
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.papyrus.bpmn.diagram.common/diagrams/process/process.palette.xml b/org.eclipse.papyrus.bpmn.diagram.common/diagrams/process/process.palette.xml
deleted file mode 100755
index 4a1a869..0000000
--- a/org.eclipse.papyrus.bpmn.diagram.common/diagrams/process/process.palette.xml
+++ /dev/null
@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<paletteDefinition>
-	<content>
-		<drawer iconpath="/icons/drawer.gif" id="org.eclipse.papyrus.bpmn.diagram.connectors"
-			name="Connectors">
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/SequenceFlow.png"
-				id="bpmn.sequenceFlow" name="SequenceFlow (Control Flow)"
-				refToolId="activity.edges.controlflow">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::SequenceFlow" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/DataAssociation.png"
-				id="bpmn.dataAssociation" name="DataAssociation (Object Flow)"
-				refToolId="activity.edges.objectflow">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::DataAssociation" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-		</drawer>
-		<drawer iconpath="/icons/drawer.gif" id="org.eclipse.papyrus.bpmn.diagram.tasks"
-			name="Tasks">
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/Task.png"
-				id="bpmn.task"
-				name="Task (Opaque Action)" refToolId="activity.nodes.miscellaneousactions.opaqueaction">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::Task" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/Task.png"
-				id="bpmn.manualTask"
-				name="ManualTask (Opaque Action)" refToolId="activity.nodes.miscellaneousactions.opaqueaction">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::ManualTask" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/Task.png"
-				id="bpmn.userTask"
-				name="UserTask (Opaque Action)" refToolId="activity.nodes.miscellaneousactions.opaqueaction">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::UserTask" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/Task.png"
-				id="bpmn.scriptTask"
-				name="ScriptTask (Opaque Action)" refToolId="activity.nodes.miscellaneousactions.opaqueaction">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::ScriptTask" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/Task.png"
-				id="bpmn.businessRuleTask"
-				name="BusinessRuleTask (Opaque Action)" refToolId="activity.nodes.miscellaneousactions.opaqueaction">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::BusinessRuleTask" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/SendTask.png"
-				id="bpmn.sendTask"
-				name="SendTask (Call Operation Action)" refToolId="activity.nodes.invocationactions.calloperationaction">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::SendTask" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/ServiceTask.png"
-				id="bpmn.serviceTask"
-				name="ServiceTask (Call Operation Action)" refToolId="activity.nodes.invocationactions.calloperationaction">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::ServiceTask" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-		</drawer>
-		<drawer iconpath="/icons/drawer.gif" id="org.eclipse.papyrus.bpmn.diagram.gateways"
-			name="Gateways">
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/InclusiveGateway.png"
-				id="bpmn.inclusiveGateway" name="InclusiveGateway (Join node)"
-				refToolId="activity.nodes.controlnodes.joinnode">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::InclusiveGateway" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/ExclusiveGateway.png"
-				id="bpmn.exclusiveGateway" name="ExclusiveGateway (Decision node)"
-				refToolId="activity.nodes.controlnodes.decisionnode">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::ExclusiveGateway" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/ExclusiveGateway.png"
-				id="bpmn.exclusiveGateway" name="ExclusiveGateway (Merge node)"
-				refToolId="activity.nodes.controlnodes.mergenode">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::ExclusiveGateway" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/ParallelGateway.png"
-				id="bpmn.parallelGateway" name="ParallelGateway (Join node)"
-				refToolId="activity.nodes.controlnodes.joinnode">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::ParallelGateway" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/InclusiveGateway.png"
-				id="bpmn.inclusiveGateway" name="InclusiveGateway (Fork node)"
-				refToolId="activity.nodes.controlnodes.forknode">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::InclusiveGateway" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/ParallelGateway.png"
-				id="bpmn.parallelGateway" name="ParallelGateway (Fork node)"
-				refToolId="activity.nodes.controlnodes.forknode">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::ParallelGateway" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/EventBasedGateway.png"
-				id="bpmn.eventBasedGateway" name="EventBasedGateway (Fork node)"
-				refToolId="activity.nodes.controlnodes.forknode">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::EventBasedGateway" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/EventBasedGateway.png"
-				id="bpmn.eventBasedGateway2"
-				name="EventBasedGateway (Interruptible Activity Region)" refToolId="activity.nodes.activitygroup.interruptibleactivityregion">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::EventBasedGateway" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/EventBasedGateway.png"
-				id="bpmn.eventBasedGateway3"
-				name="EventBasedGateway (Structured Activity Node)" refToolId="activity.nodes.structuredactions.structuredactivitynode">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::EventBasedGateway" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-		</drawer>
-		<drawer iconpath="/icons/drawer.gif" id="org.eclipse.papyrus.bpmn.diagram.events"
-			name="Events">
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/StartEvent.png"
-				id="bpmn.startEvent" name="StartEvent (Initial node)"
-				refToolId="activity.nodes.controlnodes.initialnode">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::StartEvent" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/EndEvent.png"
-				id="bpmn.endEvent" name="EndEvent (Flow final)"
-				refToolId="activity.nodes.controlnodes.flowfinal">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::EndEvent" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/IntermediateThrowEvent.png"
-				id="bpmn.intermediateThrowEvent"
-				name="IntermediateThrowEvent (Call Operation Action)" refToolId="activity.nodes.invocationactions.calloperationaction">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::IntermediateThrowEvent" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
- 
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/BoundaryEvent.png"
-				id="bpmn.boundaryEvent" name="BoundaryEvent (Initial node)"
-				refToolId="activity.nodes.controlnodes.initialnode">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::BoundaryEvent" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
- 
-		</drawer>
-		<drawer iconpath="/icons/drawer.gif"
-			id="org.eclipse.papyrus.bpmn.diagram.subprocesses" name="Subprocesses">
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/SubProcess.png"
-				id="bpmn.subprocess"
-				name="SubProcess (Structured Activity Node)" refToolId="activity.nodes.structuredactions.structuredactivitynode">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::SubProcess" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-		</drawer>
-		<drawer iconpath="/icons/drawer.gif" id="org.eclipse.papyrus.bpmn.diagram.dataitems"
-			name="Data Items">
-			<!-- 
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/DataStore.png"
-				id="bpmn.dataInput" name="DataStore (Class)"
-				refToolId="activity.nodes.pins.class">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::DataStore" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			 -->
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/DataStore.png"
-				id="bpmn.dataStoreProperty" name="DataStore Property (Data Store Node)"
-				refToolId="activity.nodes.datastorenode">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::BPMNProperty" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/DataInput.png"
-				id="bpmn.dataInput" name="DataInput (Input Pin)"
-				refToolId="activity.nodes.pins.inputpin">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::DataInput" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/DataOutput.png"
-				id="bpmn.dataOutput" name="DataOutput (Output Pin)"
-				refToolId="activity.nodes.pins.outputpin">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::DataOutput" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-		</drawer>
-		<drawer iconpath="/icons/drawer.gif" id="org.eclipse.papyrus.bpmn.diagram.swimlanes"
-			name="Swim Lanes">
-			<aspectTool description="Create an element with a stereotype"
-				iconpath="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/Lane.png"
-				id="bpmn.lane"
-				name="Lane (Activity Partition)" refToolId="activity.nodes.activitygroup.activitypartition">
-				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-					<stereotypesToApply>
-						<stereotype stereotypeName="BPMNProfile::Lane" />
-					</stereotypesToApply>
-				</postAction>
-			</aspectTool>
-		</drawer>
-	</content>
-</paletteDefinition>
\ No newline at end of file
diff --git a/org.eclipse.papyrus.bpmn.diagram.common/plugin.xml b/org.eclipse.papyrus.bpmn.diagram.common/plugin.xml
index 73de52b..8abfa29 100755
--- a/org.eclipse.papyrus.bpmn.diagram.common/plugin.xml
+++ b/org.eclipse.papyrus.bpmn.diagram.common/plugin.xml
@@ -1,121 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
-<plugin> 
-   <extension
-         point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
-      <diagramCategory
-            class="org.eclipse.papyrus.bpmn.diagram.common.commands.CreateBpmnModelCommand"
-            description="Papyrus BPMN diagrams"
-            icon="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/bpmn_32x32.png"
-            id="BPMN"
-            label="BPMN">
-      </diagramCategory>
-   </extension>
-
-  <extension
-        point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
-     <editpolicyProvider
-           class="org.eclipse.papyrus.bpmn.diagram.common.editpolicy.BpmnProcessEditPolicyProvider">
-        <Priority
-              name="Highest">
-        </Priority>
-     </editpolicyProvider>
-  </extension>
-  <extension
-        point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
-     <editpartProvider
-           class="org.eclipse.papyrus.bpmn.diagram.common.providers.CustomBpmnUMLEditPartProvider">
-        <Priority
-              name="Highest">
-        </Priority>
-     </editpartProvider>
-  </extension>
-     
- <!--
-    <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="BPMNPalette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-            name="BPMNPalette"
-            path="diagrams/process/process.palette.xml"
-            provider="CEA LIST">
-         <Priority
-               name="Medium">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.activity">
-         </editor>
-      </paletteDefinition>
+<plugin>
+	<extension
+			point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
+		<diagramCategory
+				class="org.eclipse.papyrus.bpmn.diagram.common.commands.CreateBpmnModelCommand"
+				description="Papyrus BPMN diagrams"
+				icon="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/bpmn_32x32.png"
+				id="BPMN"
+				label="BPMN">
+		</diagramCategory>
 	</extension>
- <extension
-      point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
-   <editpartProvider
-         class="org.eclipse.papyrus.bpmn.diagram.common.providers.CustomUMLEditPartProvider">
-      <Priority
-            name="Highest">
-      </Priority>
-      <object
-            class="org.eclipse.gmf.runtime.notation.Diagram"
-            id="generated-diagram">
-         <method
-               name="getType()"
-               value="PapyrusUMLActivityDiagram">
-         </method>
-      </object>
-      <object
-            class="org.eclipse.gmf.runtime.notation.Node"
-            id="generated-nodes">
-         <method
-               name="getType()">
-         </method>
-      </object>
-      <object
-            class="org.eclipse.gmf.runtime.notation.Edge"
-            id="generated-links">
-         <method
-               name="getType()">
-         </method>
-      </object>
-      <object
-            class="org.eclipse.gmf.runtime.notation.Node"
-            id="generated-labels">
-         <method
-               name="getType()">
-         </method>
-      </object>
-      <object
-            class="org.eclipse.gmf.runtime.notation.Node"
-            id="generated-compartments">
-         <method
-               name="getType()">
-         </method>
-      </object>
-      <context
-            views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments">
-      </context>
-   </editpartProvider>
-</extension>
-   -->
-   <extension
-        point="org.eclipse.papyrus.infra.gmfdiag.css.userAgentStyleSheet">
-     <stylesheet
-           stylesheetPath="css/style.css">
-     </stylesheet>
-  </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-      <elementTypeSet
-            clientContextID="org.eclipse.papyrus.bpmn.descriptionLanguage"
-            path="model/bpmndi.elementtypesconfigurations">
-      </elementTypeSet>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-      <elementTypeSet
-            clientContextID="org.eclipse.papyrus.bpmn.descriptionLanguage"
-            path="model/customBpmndi.elementtypesconfigurations">
-      </elementTypeSet>
-   </extension>
- </plugin>
+
+	<extension
+			point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
+		<editpolicyProvider
+				class="org.eclipse.papyrus.bpmn.diagram.common.editpolicy.BpmnProcessEditPolicyProvider">
+			<Priority
+					name="Highest">
+			</Priority>
+		</editpolicyProvider>
+	</extension>
+	<extension
+			point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
+		<editpartProvider
+				class="org.eclipse.papyrus.bpmn.diagram.common.providers.CustomBpmnUMLEditPartProvider">
+			<Priority
+					name="Highest">
+			</Priority>
+		</editpartProvider>
+	</extension>
+	<extension
+			point="org.eclipse.papyrus.infra.gmfdiag.css.userAgentStyleSheet">
+		<stylesheet
+				stylesheetPath="css/style.css">
+		</stylesheet>
+	</extension>
+	<extension
+			point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
+		<elementTypeSet
+				clientContextID="org.eclipse.papyrus.bpmn.descriptionLanguage"
+				path="model/bpmndi.elementtypesconfigurations">
+		</elementTypeSet>
+	</extension>
+	<extension
+			point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
+		<elementTypeSet
+				clientContextID="org.eclipse.papyrus.bpmn.descriptionLanguage"
+				path="model/customBpmndi.elementtypesconfigurations">
+		</elementTypeSet>
+	</extension>
+	<extension
+			name="%extension.name"
+			point="org.eclipse.papyrus.infra.newchild">
+		<menuCreationModel
+				model="resources/BpmnNewChildMenu.creationmenumodel">
+		</menuCreationModel>
+	</extension>
+</plugin>
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/model/BpmnNewChildMenu.creationmenumodel b/org.eclipse.papyrus.bpmn.diagram.common/resources/BpmnNewChildMenu.creationmenumodel
old mode 100755
new mode 100644
similarity index 100%
rename from org.eclipse.papyrus.bpmn.diagram.ui/model/BpmnNewChildMenu.creationmenumodel
rename to org.eclipse.papyrus.bpmn.diagram.common/resources/BpmnNewChildMenu.creationmenumodel
diff --git a/org.eclipse.papyrus.bpmn.diagram.process/META-INF/MANIFEST.MF b/org.eclipse.papyrus.bpmn.diagram.process/META-INF/MANIFEST.MF
index d710745..2d41bc7 100755
--- a/org.eclipse.papyrus.bpmn.diagram.process/META-INF/MANIFEST.MF
+++ b/org.eclipse.papyrus.bpmn.diagram.process/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@
  org.eclipse.core.runtime,
  org.eclipse.papyrus.bpmn;bundle-version="0.7.0",
  org.eclipse.papyrus.bpmn.diagram.common;bundle-version="0.7.0",
- org.eclipse.papyrus.bpmn.diagram.ui;bundle-version="0.7.0",
  org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.gmf.runtime.notation.edit,
  org.eclipse.gmf.runtime.diagram.core,
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/.classpath b/org.eclipse.papyrus.bpmn.diagram.ui/.classpath
deleted file mode 100755
index c2df960..0000000
--- a/org.eclipse.papyrus.bpmn.diagram.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/.project b/org.eclipse.papyrus.bpmn.diagram.ui/.project
deleted file mode 100755
index 20ff2f8..0000000
--- a/org.eclipse.papyrus.bpmn.diagram.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.bpmn.diagram.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.papyrus.bpmn.diagram.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index b3aa6d6..0000000
--- a/org.eclipse.papyrus.bpmn.diagram.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=260
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.papyrus.bpmn.diagram.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100755
index 954281d..0000000
--- a/org.eclipse.papyrus.bpmn.diagram.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/META-INF/MANIFEST.MF b/org.eclipse.papyrus.bpmn.diagram.ui/META-INF/MANIFEST.MF
deleted file mode 100755
index 5eb0b4b..0000000
--- a/org.eclipse.papyrus.bpmn.diagram.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.papyrus.bpmn.diagram.ui;singleton:=true
-Bundle-Version: 0.9.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.bpmn.diagram.ui.Activator
-Require-Bundle: org.eclipse.ui;bundle-version="3.107.0",
- org.eclipse.ui.ide;bundle-version="3.11.0",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",
- org.eclipse.papyrus.bpmn.diagram.common;bundle-version="0.7.0",
- org.eclipse.papyrus.bpmn;bundle-version="0.7.0"
-Export-Package: org.eclipse.papyrus.bpmn.diagram.ui
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/OSGI-INF/l10n/bundle.properties b/org.eclipse.papyrus.bpmn.diagram.ui/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 608d552..0000000
--- a/org.eclipse.papyrus.bpmn.diagram.ui/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-Bundle-Vendor =  Eclipse Modeling Project
-Bundle-Name = UI for creation of BPMN models
-wizard.name = Papyrus BPMN Model
-wizard.name.0 = Papyrus BPMN Project
-wizard.description = New Bpmn Project
-extension.name = New BPMN Child
\ No newline at end of file
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/about.html b/org.eclipse.papyrus.bpmn.diagram.ui/about.html
deleted file mode 100755
index d35d5ae..0000000
--- a/org.eclipse.papyrus.bpmn.diagram.ui/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/build.properties b/org.eclipse.papyrus.bpmn.diagram.ui/build.properties
deleted file mode 100755
index 68cffc1..0000000
--- a/org.eclipse.papyrus.bpmn.diagram.ui/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               model/,\
-               OSGI-INF/
-src.includes = about.html
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/plugin.properties b/org.eclipse.papyrus.bpmn.diagram.ui/plugin.properties
deleted file mode 100755
index 0e388b9..0000000
--- a/org.eclipse.papyrus.bpmn.diagram.ui/plugin.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-#Properties file for org.eclipse.papyrus.bpmn.diagram.ui
-Bundle-Vendor =  Eclipse Modeling Project
-Bundle-Name = UI for creation of BPMN models
-wizard.name = Papyrus BPMN Model
-wizard.name.0 = Papyrus BPMN Project
-wizard.description = New Bpmn Project
-extension.name = New BPMN Child
\ No newline at end of file
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/plugin.xml b/org.eclipse.papyrus.bpmn.diagram.ui/plugin.xml
deleted file mode 100755
index 9dd65cb..0000000
--- a/org.eclipse.papyrus.bpmn.diagram.ui/plugin.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-<!--   <extension
-         point="org.eclipse.ui.newWizards">
-      <wizard
-            canFinishEarly="false"
-            category="org.eclipse.papyrus.wizards.category"
-            class="org.eclipse.papyrus.bpmn.diagram.ui.NewBpmnModelWizard"
-            finalPerspective="org.eclipse.papyrus.infra.core.perspective"
-            icon="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/bpmn_32x32.png"
-            id="org.eclipse.papyrus.wizards.createbpmnmodel"
-            name="%wizard.name">
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>
-      <wizard
-            category="org.eclipse.papyrus.wizards.category"
-            class="org.eclipse.papyrus.bpmn.diagram.ui.NewBpmnProjectWizard"
-            finalPerspective="org.eclipse.papyrus.infra.core.perspective"
-            icon="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/bpmn_32x32.png"
-            id="org.eclipse.papyrus.wizards.createbpmnwizard"
-            name="%wizard.name.0"
-            project="true">
-         <description>
-            %wizard.description
-         </description>
-      </wizard>
-   </extension>-->
-   <extension
-         name="%extension.name"
-         point="org.eclipse.papyrus.infra.newchild">
-      <menuCreationModel
-            model="model/BpmnNewChildMenu.creationmenumodel">
-      </menuCreationModel>
-   </extension>
-  <!-- 
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.wizards.templates">
-      <template
-            file="org.eclipse.papyrus.bpmn.diagram.ui.template1"
-            id="org.eclipse.papyrus.bpmn.diagram.ui.template1"
-            language="org.eclipse.papyrus.bpmn.diagram.ui.template1"
-            name="Empty Process BPMN Model">
-      </template>
-   </extension>
-   -->
-</plugin>
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/pom.xml b/org.eclipse.papyrus.bpmn.diagram.ui/pom.xml
deleted file mode 100755
index 447aaab..0000000
--- a/org.eclipse.papyrus.bpmn.diagram.ui/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus.bpmn</groupId>
-		<artifactId>org.eclipse.papyrus.bpmn.parent</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.bpmn.diagram.ui</artifactId>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/src/org/eclipse/papyrus/bpmn/diagram/ui/Activator.java b/org.eclipse.papyrus.bpmn.diagram.ui/src/org/eclipse/papyrus/bpmn/diagram/ui/Activator.java
deleted file mode 100755
index 79bf24c..0000000
--- a/org.eclipse.papyrus.bpmn.diagram.ui/src/org/eclipse/papyrus/bpmn/diagram/ui/Activator.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.bpmn.diagram.ui;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.bpmn.diagram.ui"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/src/org/eclipse/papyrus/bpmn/diagram/ui/NewBpmnModelWizard.java b/org.eclipse.papyrus.bpmn.diagram.ui/src/org/eclipse/papyrus/bpmn/diagram/ui/NewBpmnModelWizard.java
deleted file mode 100755
index db749cb..0000000
--- a/org.eclipse.papyrus.bpmn.diagram.ui/src/org/eclipse/papyrus/bpmn/diagram/ui/NewBpmnModelWizard.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.bpmn.diagram.ui;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.bpmn.diagram.common.commands.CreateBpmnModelCommand;
-import org.eclipse.papyrus.uml.diagram.wizards.wizards.CreateModelWizard;
-import org.eclipse.ui.IWorkbench;
-
-public class NewBpmnModelWizard extends CreateModelWizard {
-
-	/**
-	 * @see org.eclipse.papyrus.wizards.CreateModelWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-	 *
-	 * @param workbench
-	 * @param selection
-	 */
-
-	@Override
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		super.init(workbench, selection);
-		setWindowTitle("New Bpmn Model");
-	}
-
-	/**
-	 * Instantiates a new new Proteus model wizard.
-	 */
-	public NewBpmnModelWizard() {
-		super();
-
-	}
-
-
-
-	@Override
-	public String getModelKindName() {
-		// TODO Auto-generated method stub
-
-		return "Bpmn Model";
-	}
-
-//	@Override
-//	protected String[] getDiagramCategoryIds() {
-//		return new String[] { CreateBpmnModelCommand.COMMAND_ID };
-//	}
-
-
-
-}
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/src/org/eclipse/papyrus/bpmn/diagram/ui/NewBpmnProjectWizard.java b/org.eclipse.papyrus.bpmn.diagram.ui/src/org/eclipse/papyrus/bpmn/diagram/ui/NewBpmnProjectWizard.java
deleted file mode 100755
index 7b8ce08..0000000
--- a/org.eclipse.papyrus.bpmn.diagram.ui/src/org/eclipse/papyrus/bpmn/diagram/ui/NewBpmnProjectWizard.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.bpmn.diagram.ui;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.bpmn.diagram.common.commands.CreateBpmnModelCommand;
-import org.eclipse.papyrus.uml.diagram.wizards.wizards.NewPapyrusProjectWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
-
-public class NewBpmnProjectWizard extends NewPapyrusProjectWizard {
-
-	/**
-	 * @see org.eclipse.papyrus.wizards.NewPapyrusProjectWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-	 *
-	 * @param workbench
-	 * @param selection
-	 */
-	@Override
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		super.init(workbench, selection);
-		setWindowTitle("New Bpmn Project");
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected WizardNewProjectCreationPage createNewProjectCreationPage() {
-		WizardNewProjectCreationPage newProjectPage = super.createNewProjectCreationPage();
-		newProjectPage.setTitle("Papyrus Bpmn Project");
-		newProjectPage.setDescription("Create a New Papyrus Bpmn Project");
-		return newProjectPage;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-//	@Override
-//	protected String[] getDiagramCategoryIds() {
-//		return new String[] { CreateBpmnModelCommand.COMMAND_ID };
-//	}
-
-
-}
diff --git a/org.eclipse.papyrus.bpmn.diagram/.classpath b/org.eclipse.papyrus.bpmn.diagram/.classpath
deleted file mode 100755
index c2df960..0000000
--- a/org.eclipse.papyrus.bpmn.diagram/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/org.eclipse.papyrus.bpmn.diagram/.project b/org.eclipse.papyrus.bpmn.diagram/.project
deleted file mode 100755
index 3219e4d..0000000
--- a/org.eclipse.papyrus.bpmn.diagram/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.bpmn.diagram</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.papyrus.bpmn.diagram/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.papyrus.bpmn.diagram/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index b3aa6d6..0000000
--- a/org.eclipse.papyrus.bpmn.diagram/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=260
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/org.eclipse.papyrus.bpmn.diagram/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.papyrus.bpmn.diagram/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100755
index 954281d..0000000
--- a/org.eclipse.papyrus.bpmn.diagram/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/org.eclipse.papyrus.bpmn.diagram/META-INF/MANIFEST.MF b/org.eclipse.papyrus.bpmn.diagram/META-INF/MANIFEST.MF
deleted file mode 100755
index ef52567..0000000
--- a/org.eclipse.papyrus.bpmn.diagram/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.bpmn.diagram
-Require-Bundle: org.eclipse.ui;bundle-version="[3.108.0,4.0.0)",
- org.eclipse.core.runtime,
- org.eclipse.papyrus.bpmn;bundle-version="0.7.0",
- org.eclipse.papyrus.bpmn.diagram.common;bundle-version="0.7.0",
- org.eclipse.papyrus.bpmn.diagram.process;bundle-version="0.7.0",
- org.eclipse.papyrus.bpmn.diagram.ui;bundle-version="0.7.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.core,
- org.eclipse.papyrus.infra.gmfdiag.css
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 0.9.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.bpmn.diagram.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.bpmn.diagram;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.eclipse.papyrus.bpmn.diagram/OSGI-INF/l10n/bundle.properties b/org.eclipse.papyrus.bpmn.diagram/OSGI-INF/l10n/bundle.properties
deleted file mode 100755
index 59d9507..0000000
--- a/org.eclipse.papyrus.bpmn.diagram/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.bpmn.diagram
-Bundle-Name = BPMN diagram base
-Bundle-Vendor = Eclipse Modeling Project
\ No newline at end of file
diff --git a/org.eclipse.papyrus.bpmn.diagram/about.html b/org.eclipse.papyrus.bpmn.diagram/about.html
deleted file mode 100755
index d35d5ae..0000000
--- a/org.eclipse.papyrus.bpmn.diagram/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/org.eclipse.papyrus.bpmn.diagram/build.properties b/org.eclipse.papyrus.bpmn.diagram/build.properties
deleted file mode 100755
index 84b0fc1..0000000
--- a/org.eclipse.papyrus.bpmn.diagram/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               viewpoints/,\
-               OSGI-INF/,\
-               about.html
-src.includes = about.html
diff --git a/org.eclipse.papyrus.bpmn.diagram/plugin.xml b/org.eclipse.papyrus.bpmn.diagram/plugin.xml
deleted file mode 100755
index a9e50c4..0000000
--- a/org.eclipse.papyrus.bpmn.diagram/plugin.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-  <extension
-       point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-    <contribution
-          file="viewpoints/bpmn.configuration"
-          original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-    </contribution>
- </extension>
-</plugin>
diff --git a/org.eclipse.papyrus.bpmn.diagram/pom.xml b/org.eclipse.papyrus.bpmn.diagram/pom.xml
deleted file mode 100755
index cb52f9f..0000000
--- a/org.eclipse.papyrus.bpmn.diagram/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus.bpmn</groupId>
-		<artifactId>org.eclipse.papyrus.bpmn.parent</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.bpmn.diagram</artifactId>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/org.eclipse.papyrus.bpmn.diagram/src/org/eclipse/papyrus/bpmn/diagram/Activator.java b/org.eclipse.papyrus.bpmn.diagram/src/org/eclipse/papyrus/bpmn/diagram/Activator.java
deleted file mode 100755
index e882624..0000000
--- a/org.eclipse.papyrus.bpmn.diagram/src/org/eclipse/papyrus/bpmn/diagram/Activator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.bpmn.diagram;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.bpmn.diagram"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/org.eclipse.papyrus.bpmn.diagram/viewpoints/bpmn.configuration b/org.eclipse.papyrus.bpmn.diagram/viewpoints/bpmn.configuration
deleted file mode 100755
index d2ae180..0000000
--- a/org.eclipse.papyrus.bpmn.diagram/viewpoints/bpmn.configuration
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_0kyH4PL_EeONXPQ2mbw9vA" defaultStakeholder="_0kyu8PL_EeONXPQ2mbw9vA">
-  <stakeholders xmi:id="_oEQ6oKYJEeS3vNH2fiQDrQ" name="Business Process Analyst"/>
-  <stakeholders xmi:id="_0kyu8PL_EeONXPQ2mbw9vA" name="Enterprise System Architect"/>
-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_0kyu8fL_EeONXPQ2mbw9vA" name="Default Papyrus Viewpoint">
-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_0kzWAPL_EeONXPQ2mbw9vA" name="BPMN Process Diagram" icon="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/Processdi.png" implementationID="PapyrusUMLActivityDiagram" categories="_0kz9GPL_EeONXPQ2mbw9vA">
-   <!--
-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_0kzWAPL_EeONXPQ2mbw9vA" name="BPMN Process Diagram" icon="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/bpmn_16x16.png" implementationID="PapyrusUMLActivityDiagram" categories="_0kz9GPL_EeONXPQ2mbw9vA" customStyle="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/css/style.css">
-   --> 
-      <profiles href="http://www.omg.org/spec/BPMNProfile/20121112/#/"/>
-      <modelRules xmi:id="_0kzWAfL_EeONXPQ2mbw9vA">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
-        <stereotypes href="http://www.omg.org/spec/BPMNProfile/20121112/#//BPMNProcess"/>
-      </modelRules>
-      <owningRules xmi:id="_0kzWAvL_EeONXPQ2mbw9vA">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        <newModelPath xmi:id="_EwB-kKx4EeSnrKVaqDJBJQ" creationType="org.eclipse.papyrus.bpmn.BPMNProcess_Activity">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
-        </newModelPath>
-      </owningRules>
-      <owningRules xmi:id="_0kzWAvL_EeONXPQ2mbw9vA">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
-        <newModelPath xmi:id="_EwB-kKx4EeSnrKVaqDJBJQ" creationType="org.eclipse.papyrus.bpmn.BPMNProcess_Activity">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
-        </newModelPath>
-      </owningRules>
-      <childRules xmi:id="_hnObI2ThEeS0VelLgL_ZMA"/>
-      <paletteRules xmi:id="_hnObJGThEeS0VelLgL_ZMA" permit="false" element="activity.*"/>
-      <paletteRules xmi:id="_yRqRULFbEeWgGbmmY-b2nA" permit="false" element="bpmn.collaboration.*"/>
-    </modelKinds>
-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_0kzWAPL_EeONXPQ2mbw9vB" name="BPMN Collaboration Diagram" icon="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/Collaborationdi.png" implementationID="PapyrusUMLActivityDiagram" categories="_0kz9GPL_EeONXPQ2mbw9vA">
-    <!--
-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_0kzWAPL_EeONXPQ2mbw9vB" name="BPMN Collaboration Diagram" icon="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/BpmnCollaboration_16x16.png" implementationID="PapyrusUMLActivityDiagram" categories="_0kz9GPL_EeONXPQ2mbw9vA" customStyle="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/css/style.css">
-    -->
-      <profiles href="http://www.omg.org/spec/BPMNProfile/20121112/#/"/>
-      <modelRules xmi:id="_0kzWAfL_EeONXPQ2mbw9vA">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>
-        <stereotypes href="http://www.omg.org/spec/BPMNProfile/20121112/#//BPMNCollaboration"/>
-      </modelRules>
-      <owningRules xmi:id="_0kzWAvL_EeONXPQ2mbw9vA">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        <newModelPath xmi:id="_EwB-kKx4EeSnrKVaqDJBJQ" creationType="org.eclipse.papyrus.bpmn.BPMNCollaboration_Collaboration">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
-        </newModelPath>
-      </owningRules>
-      <owningRules xmi:id="_0kzWAvL_EeONXPQ2mbw9vA">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>
-        <newModelPath xmi:id="_EwB-kKx4EeSnrKVaqDJBJQ" creationType="org.eclipse.papyrus.bpmn.BPMNCollaboration_Collaboration">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
-        </newModelPath>
-      </owningRules>
-      <childRules xmi:id="_hnObI2ThEeS0VelLgL_ZMA"/>
-      <paletteRules xmi:id="_hnObJGThEeS0VelLgL_ZMA" permit="false" element="activity.*"/>
-      <paletteRules xmi:id="_NOr_0LFZEeWgGbmmY-b2nA" permit="false" element="bpmn.process.*"/>
-    </modelKinds>
-  </viewpoints>
-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-  <categories xmi:id="_0kz9GPL_EeONXPQ2mbw9vA" name="BPMN"/>
-</configuration:PapyrusConfiguration>
diff --git a/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/LaneCustom.java b/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/LaneCustom.java
index eac2846..620ceff 100755
--- a/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/LaneCustom.java
+++ b/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/LaneCustom.java
@@ -12,18 +12,11 @@
  *****************************************************************************/
 package org.eclipse.papyrus.bpmn.BPMNProfile.impl;
 
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
 import org.apache.log4j.Logger;
-import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfileFactory;
-import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage;
 import org.eclipse.papyrus.bpmn.BPMNProfile.Lane;
 import org.eclipse.papyrus.bpmn.BPMNProfile.LaneSet;
 import org.eclipse.uml2.uml.ActivityPartition;
 import org.eclipse.uml2.uml.util.UMLUtil;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
 
 public class LaneCustom {
 	private static final Logger log = Logger.getLogger(LaneCustom.class);
@@ -34,20 +27,10 @@
 	public static LaneSet basicGetChildLaneSet(Lane lane) {
 		LaneSet laneSet = null;
 		ActivityPartition activityPartition = lane.getBase_ActivityPartition();
-		if(activityPartition != null) {
+		if (activityPartition != null) {
 			laneSet = UMLUtil.getStereotypeApplication(activityPartition, LaneSet.class);
 		}
-		
-/*		if(activityPartition != null){
-			List<ActivityPartition> subPartitions = activityPartition.getSubpartitions();
-			if(subPartitions != null && !subPartitions.isEmpty()){
-				laneSet = BPMNProfileFactory.eINSTANCE.createLaneSet();
-				laneSet.setBase_ActivityPartition(activityPartition);
-				List<Lane> lanes = subPartitions.stream().map(p -> UMLUtil.getStereotypeApplication(p, Lane.class)).filter(Objects::nonNull).collect(Collectors.toList());
-				laneSet.getLanes().addAll(lanes);
-				log.debug(lanes);
-			}
-		}*/
+
 		return laneSet;
 	}
 
@@ -55,9 +38,9 @@
 	public static LaneSet basicGetLaneSet(Lane lane) {
 		LaneSet laneSet = null;
 		ActivityPartition activityPartition = lane.getBase_ActivityPartition();
-		if(activityPartition != null) {
+		if (activityPartition != null) {
 			ActivityPartition superPartition = activityPartition.getSuperPartition();
-			if(superPartition != null){
+			if (superPartition != null) {
 				laneSet = UMLUtil.getStereotypeApplication(superPartition, LaneSet.class);
 			}
 		}
diff --git a/pom.xml b/pom.xml
index 92a90a6..40e6659 100755
--- a/pom.xml
+++ b/pom.xml
@@ -40,8 +40,7 @@
 		<module>org.eclipse.papyrus.bpmn.diagram.common</module>
 		<module>org.eclipse.papyrus.bpmn.diagram.process</module>
 		<module>org.eclipse.papyrus.bpmn.diagram.collaboration</module>
-		<module>org.eclipse.papyrus.bpmn.diagram.ui</module>
-		
+
 		<module>org.eclipse.papyrus.bpmn.tests</module>
 		<module>org.eclipse.papyrus.bpmn.diagram.common.tests</module>
 
diff --git a/releng/org.eclipse.papyrus.bpmn.feature/feature.xml b/releng/org.eclipse.papyrus.bpmn.feature/feature.xml
index 9b75b77..b5bf792 100755
--- a/releng/org.eclipse.papyrus.bpmn.feature/feature.xml
+++ b/releng/org.eclipse.papyrus.bpmn.feature/feature.xml
@@ -42,14 +42,7 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.bpmn.diagram.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
+   
    <plugin
          id="org.eclipse.papyrus.bpmn.diagram.process"
          download-size="0"