diff --git a/components/org.eclipse.papyrus.components.parent/pom.xml b/components/org.eclipse.papyrus.components.parent/pom.xml
index efd46ae..bfe054e 100644
--- a/components/org.eclipse.papyrus.components.parent/pom.xml
+++ b/components/org.eclipse.papyrus.components.parent/pom.xml
@@ -146,6 +146,7 @@
 
 	<modules>
 		<module>org.eclipse.papyrus.components.archetype</module>
+		<module>targetplatforms</module>
 	</modules>
 
 	<dependencyManagement>
diff --git a/components/org.eclipse.papyrus.components.parent/src/site/xdoc/user/sop-targetPlatformUpdate.xml b/components/org.eclipse.papyrus.components.parent/src/site/xdoc/user/sop-targetPlatformUpdate.xml
index cebb10d..836a9d0 100644
--- a/components/org.eclipse.papyrus.components.parent/src/site/xdoc/user/sop-targetPlatformUpdate.xml
+++ b/components/org.eclipse.papyrus.components.parent/src/site/xdoc/user/sop-targetPlatformUpdate.xml
@@ -16,12 +16,12 @@
 				<p>You have to have a target.file at the root of your target platform plugin. You need to specify with target platform to activate through profile management.</p>
 				
 				<source>
-				mvn validate -DtargetUpdate=true -Declipse.targetrelease=neon-papyrusnightly -Declipse.release=neon-papyrusnightly -f targetplatform/pom.xml
+				mvn org.eclipse.tycho.extras:tycho-version-bump-plugin:1.0.0:update-target -Dtarget=yourtarget.target
 				</source>
 				<p>the tycho-version-bump-plugin is bound to the validate phase</p>
 				<p>-DtargetUpdate=true ensure you enforce the taregtUpdate</p>
-				<p>-Declipse.targetrelease=neon-papyrusnightly -Declipse.release=neon-papyrusnightly: specify with target to update</p>
-				<p>-f targetplatform/pom.xml: specify the pom to look at</p>
+				<p>eventually add -Declipse.targetrelease=neon-papyrusnightly -Declipse.release=neon-papyrusnightly: specify with target to update</p>
+				<p>and -f targetplatform/pom.xml: specify the pom to look at</p>
 			</subsection>
 		</section>
 	</body>
diff --git a/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.neon.dev.pnightly/org.eclipse.papyrus.components.targetplatforms.neon.dev.pnightly.target b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.neon.dev.pnightly/org.eclipse.papyrus.components.targetplatforms.neon.dev.pnightly.target
new file mode 100644
index 0000000..0def049
--- /dev/null
+++ b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.neon.dev.pnightly/org.eclipse.papyrus.components.targetplatforms.neon.dev.pnightly.target
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="Papyrus Dev Neon Nightly" sequenceNumber="1479378486">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.xpand.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.xtend.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ocl.examples.classic.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ocl.examples.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.query.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.team.svn.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.gmf.tooling.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.gef.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/neon/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.xtext.redist.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/webtools/downloads/drops/R3.9.0/S-3.9.0M3-20161031000121/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/nebula/releases/1.1.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/nattable/releases/1.4.0/repository"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/neon/"/>
+</location>
+</locations>
+</target>
\ No newline at end of file
diff --git a/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.neon.dev.pnightly/pom.xml b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.neon.dev.pnightly/pom.xml
new file mode 100644
index 0000000..6a0e4ad
--- /dev/null
+++ b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.neon.dev.pnightly/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus.components.targetplatforms</groupId>
+		<artifactId>org.eclipse.papyrus.components.targetplatforms.parent</artifactId>
+		<version>0.0.23-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.components.targetplatforms.neon.dev.pnightly</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	<name>org.eclipse.papyrus.components.targetplatforms.neon.dev.pnightly</name>
+	<description>This plug-in contains the target definition for Papyrus in Neon for developement.</description>
+</project>
\ No newline at end of file
diff --git a/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.neon.pnightly/org.eclipse.papyrus.components.targetplatforms.neon.pnightly.target b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.neon.pnightly/org.eclipse.papyrus.components.targetplatforms.neon.pnightly.target
new file mode 100644
index 0000000..d0cb90e
--- /dev/null
+++ b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.neon.pnightly/org.eclipse.papyrus.components.targetplatforms.neon.pnightly.target
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<target name="Papyrus Neon Nightly" sequenceNumber="1458824765">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/>
+      <repository id="eclipse-neon" location="http://download.eclipse.org/releases/neon/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-nighlty-neon" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/neon/main/"/>
+    </location>
+  </locations>
+</target>
diff --git a/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.neon.pnightly/pom.xml b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.neon.pnightly/pom.xml
new file mode 100644
index 0000000..6eadbf3
--- /dev/null
+++ b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.neon.pnightly/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus.components.targetplatforms</groupId>
+		<artifactId>org.eclipse.papyrus.components.targetplatforms.parent</artifactId>
+		<version>0.0.23-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.components.targetplatforms.neon.pnightly</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	<name>org.eclipse.papyrus.components.targetplatforms.neon.pnightly</name>
+	<description>This plug-in contains the target definition for Papyrus in Neon Nightly.</description>
+</project>
\ No newline at end of file
diff --git a/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.neon/org.eclipse.papyrus.components.targetplatforms.neon.target b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.neon/org.eclipse.papyrus.components.targetplatforms.neon.target
new file mode 100644
index 0000000..6361f83
--- /dev/null
+++ b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.neon/org.eclipse.papyrus.components.targetplatforms.neon.target
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<target name="Papyrus Neon" sequenceNumber="1462889130">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/>
+      <repository id="eclipse-neon" location="http://download.eclipse.org/releases/neon/"/>
+    </location>
+  </locations>
+</target>
\ No newline at end of file
diff --git a/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.neon/pom.xml b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.neon/pom.xml
new file mode 100644
index 0000000..ad78911
--- /dev/null
+++ b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.neon/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus.components.targetplatforms</groupId>
+		<artifactId>org.eclipse.papyrus.components.targetplatforms.parent</artifactId>
+		<version>0.0.23-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.components.targetplatforms.neon</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	<name>org.eclipse.papyrus.components.targetplatforms.neon</name>
+	<description>This plug-in contains the target definition for Papyrus in Neon.</description>
+</project>
\ No newline at end of file
diff --git a/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.oxygen.dev.pnightly/org.eclipse.papyrus.components.targetplatforms.oxygen.dev.pnightly.target b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.oxygen.dev.pnightly/org.eclipse.papyrus.components.targetplatforms.oxygen.dev.pnightly.target
new file mode 100644
index 0000000..294f9ca
--- /dev/null
+++ b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.oxygen.dev.pnightly/org.eclipse.papyrus.components.targetplatforms.oxygen.dev.pnightly.target
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="Papyrus Dev Oxygen Nightly" sequenceNumber="1479378486">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.xpand.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.xtend.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ocl.examples.classic.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ocl.examples.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.query.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.team.svn.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.gmf.tooling.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.gef.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/oxygen/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.xtext.redist.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.wst.xml_sdk.feature.feature.group" version="3.9.0.v201608061824"/>
+<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.9.0.v201608061824"/>
+<repository location="http://download.eclipse.org/webtools/downloads/drops/R3.9.0/S-3.9.0M3-20161031000121/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201609231530"/>
+<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.0.0.201609231530"/>
+<repository location="http://download.eclipse.org/nebula/releases/1.1.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201606011907"/>
+<unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.4.0.201606011907"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.4.0.201606011907"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.4.0.201606011907"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.0.0.201606011907"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.0.0.201606011907"/>
+<repository location="http://download.eclipse.org/nattable/releases/1.4.0/repository"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.toolsmiths.feature.source.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/"/>
+</location>
+</locations>
+</target>
\ No newline at end of file
diff --git a/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.oxygen.dev.pnightly/pom.xml b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.oxygen.dev.pnightly/pom.xml
new file mode 100644
index 0000000..91893c6
--- /dev/null
+++ b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.oxygen.dev.pnightly/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus.components.targetplatforms</groupId>
+		<artifactId>org.eclipse.papyrus.components.targetplatforms.parent</artifactId>
+		<version>0.0.23-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.components.targetplatforms.oxygen.dev.pnightly</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	<name>org.eclipse.papyrus.components.targetplatforms.oxygen.dev.pnightly</name>
+	<description>This plug-in contains the target definition for Papyrus in Oxygen for development.</description>
+</project>
\ No newline at end of file
diff --git a/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.oxygen.pnightly/org.eclipse.papyrus.components.targetplatforms.oxygen.pnightly.target b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.oxygen.pnightly/org.eclipse.papyrus.components.targetplatforms.oxygen.pnightly.target
new file mode 100644
index 0000000..d0cb90e
--- /dev/null
+++ b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.oxygen.pnightly/org.eclipse.papyrus.components.targetplatforms.oxygen.pnightly.target
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<target name="Papyrus Neon Nightly" sequenceNumber="1458824765">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/>
+      <repository id="eclipse-neon" location="http://download.eclipse.org/releases/neon/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <repository id="eclipse-papyrus-nighlty-neon" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/neon/main/"/>
+    </location>
+  </locations>
+</target>
diff --git a/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.oxygen.pnightly/pom.xml b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.oxygen.pnightly/pom.xml
new file mode 100644
index 0000000..3103c49
--- /dev/null
+++ b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.oxygen.pnightly/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus.components.targetplatforms</groupId>
+		<artifactId>org.eclipse.papyrus.components.targetplatforms.parent</artifactId>
+		<version>0.0.23-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.components.targetplatforms.oxygen.pnightly</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	<name>org.eclipse.papyrus.components.targetplatforms.oxygen.pnightly</name>
+	<description>This plug-in contains the target definition for Papyrus in Oxygen Nightly.</description>
+</project>
\ No newline at end of file
diff --git a/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.oxygen/org.eclipse.papyrus.components.targetplatforms.oxygen.target b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.oxygen/org.eclipse.papyrus.components.targetplatforms.oxygen.target
new file mode 100644
index 0000000..0e324b2
--- /dev/null
+++ b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.oxygen/org.eclipse.papyrus.components.targetplatforms.oxygen.target
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<target name="Papyrus Neon" sequenceNumber="1462889130">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/>
+      <repository id="eclipse-neon" location="http://download.eclipse.org/releases/neon/"/>
+    </location>
+  </locations>
+</target>
diff --git a/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.oxygen/pom.xml b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.oxygen/pom.xml
new file mode 100644
index 0000000..adf276b
--- /dev/null
+++ b/components/org.eclipse.papyrus.components.parent/targetplatforms/org.eclipse.papyrus.components.targetplatforms.oxygen/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus.components.targetplatforms</groupId>
+		<artifactId>org.eclipse.papyrus.components.targetplatforms.parent</artifactId>
+		<version>0.0.23-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.components.targetplatforms.oxygen</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	<name>org.eclipse.papyrus.components.targetplatforms.oxygen</name>
+	<description>This plug-in contains the target definition for Papyrus in Oxygen.</description>
+</project>
\ No newline at end of file
diff --git a/components/org.eclipse.papyrus.components.parent/targetplatforms/pom.xml b/components/org.eclipse.papyrus.components.parent/targetplatforms/pom.xml
new file mode 100644
index 0000000..f8235b5
--- /dev/null
+++ b/components/org.eclipse.papyrus.components.parent/targetplatforms/pom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus.components</groupId>
+		<artifactId>org.eclipse.papyrus.components.parent</artifactId>
+		<version>0.0.23-SNAPSHOT</version>
+	</parent>
+	<groupId>org.eclipse.papyrus.components.targetplatforms</groupId>
+	<artifactId>org.eclipse.papyrus.components.targetplatforms.parent</artifactId>
+	<packaging>pom</packaging>
+
+	<modules>
+		<module>org.eclipse.papyrus.components.targetplatforms.neon</module>
+		<module>org.eclipse.papyrus.components.targetplatforms.neon.dev.pnightly</module>
+		<module>org.eclipse.papyrus.components.targetplatforms.neon.pnightly</module>
+
+		<module>org.eclipse.papyrus.components.targetplatforms.oxygen</module>
+		<module>org.eclipse.papyrus.components.targetplatforms.oxygen.dev.pnightly</module>
+		<module>org.eclipse.papyrus.components.targetplatforms.oxygen.pnightly</module>
+
+	</modules>
+
+</project>
\ No newline at end of file