diff --git a/talend.studio.tos.di.product/.project b/build/talend.studio.tos.di.product/.project
similarity index 100%
rename from talend.studio.tos.di.product/.project
rename to build/talend.studio.tos.di.product/.project
diff --git a/talend.studio.tos.di.product/config.ini b/build/talend.studio.tos.di.product/config.ini
similarity index 100%
rename from talend.studio.tos.di.product/config.ini
rename to build/talend.studio.tos.di.product/config.ini
diff --git a/talend.studio.tos.di.product/build/launcher.ini b/build/talend.studio.tos.di.product/launcher.ini
similarity index 100%
rename from talend.studio.tos.di.product/build/launcher.ini
rename to build/talend.studio.tos.di.product/launcher.ini
diff --git a/talend.studio.tos.di.product/build/launcher_64.ini b/build/talend.studio.tos.di.product/launcher_64.ini
similarity index 100%
rename from talend.studio.tos.di.product/build/launcher_64.ini
rename to build/talend.studio.tos.di.product/launcher_64.ini
diff --git a/talend.studio.tos.di.product/build/macosx_infoplist.properties b/build/talend.studio.tos.di.product/macosx_infoplist.properties
similarity index 100%
rename from talend.studio.tos.di.product/build/macosx_infoplist.properties
rename to build/talend.studio.tos.di.product/macosx_infoplist.properties
diff --git a/talend.studio.tos.di.product/pom.xml b/build/talend.studio.tos.di.product/pom.xml
similarity index 82%
rename from talend.studio.tos.di.product/pom.xml
rename to build/talend.studio.tos.di.product/pom.xml
index 1c7e5a2..75509f5 100644
--- a/talend.studio.tos.di.product/pom.xml
+++ b/build/talend.studio.tos.di.product/pom.xml
@@ -69,36 +69,6 @@
 					</products>
 				</configuration>        
 			</plugin>
-			<!--<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>make-directory-assembly</id>
-						<phase>package</phase>
-						<configuration>
-							<appendAssemblyId>false</appendAssemblyId>
-							<descriptor>${basedir}/assembly-descriptor.xml</descriptor>
-							<finalName>${product.short.name}-${project.version}</finalName>
-						</configuration>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>-->
-			<!--<execution>
-						<id>make-zip-assembly</id>
-						<phase>install</phase>
-						<configuration>
-							<appendAssemblyId>false</appendAssemblyId>
-							<descriptor>${basedir}/assembly-zip-descriptor.xml</descriptor>
-							<finalName>${product.short.name}-${project.version}</finalName>
-						</configuration>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
@@ -114,7 +84,7 @@
 							<artifactItems>
 								<artifactItem>
 									<groupId>org.talend.studio</groupId>
-									<artifactId>binaries</artifactId>
+									<artifactId>eclipse-launcher-binaries</artifactId>
 									<version>3.6.1</version>
 									<type>zip</type>
 									<overWrite>true</overWrite>
@@ -153,9 +123,9 @@
 							<target>
 								<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath"/>
 								<property name="launcher.prefix"
-											value="TOS-DI" />
+											value="TOS_DI" />
 								<loadproperties>
-									<file file="${project.basedir}/build/macosx_infoplist.properties"/>
+									<file file="${project.basedir}/macosx_infoplist.properties"/>
 								</loadproperties>
 								<move file="${studio.dir}/launcher-macosx-cocoa.app" tofile="${studio.dir}/${launcher.prefix}-macosx-cocoa.app"/>
 								<move todir="${studio.dir}">
@@ -171,18 +141,18 @@
 										from="(.*)launcher(.*)" to="\1${launcher.prefix}\2" />
 									</mapper>
 								</move>
-								
+
 								<ac:for list="linux-gtk-ppc,solaris-gtk,solaris-gtk-x86,win32-wpf,win32-x86" param="platform" xmlns:ac="antlib:net.sf.antcontrib">
 									<sequential>
-										<copy tofile="${studio.dir}/${launcher.prefix}-@{platform}.ini" file="${project.basedir}/build/launcher.ini" />
+										<copy tofile="${studio.dir}/${launcher.prefix}-@{platform}.ini" file="${project.basedir}/launcher.ini" />
 									</sequential>
 								</ac:for>
 								<ac:for list="linux-gtk-x86_64,win-x86_64" param="platform" xmlns:ac="antlib:net.sf.antcontrib">
 									<sequential>
-										<copy tofile="${studio.dir}/${launcher.prefix}-@{platform}.ini" file="${project.basedir}/build/launcher_64.ini" />
+										<copy tofile="${studio.dir}/${launcher.prefix}-@{platform}.ini" file="${project.basedir}/launcher_64.ini" />
 									</sequential>
 								</ac:for>
-								<copy tofile="${studio.dir}/${launcher.prefix}-macosx-cocoa.app/Contents/MacOS/${launcher.prefix}-macosx-cocoa.ini" file="${project.basedir}/build/launcher_64.ini" />
+								<copy tofile="${studio.dir}/${launcher.prefix}-macosx-cocoa.app/Contents/MacOS/${launcher.prefix}-macosx-cocoa.ini" file="${project.basedir}/launcher_64.ini" />
 								<loadfile property="plist" srcFile="${studio.dir}/${launcher.prefix}-macosx-cocoa.app/Contents/Info.plist">
 									<filterchain>
 										<expandproperties/>
diff --git a/build/talend.studio.tos.di.product/talend.p2.inf b/build/talend.studio.tos.di.product/talend.p2.inf
new file mode 100644
index 0000000..d3b7963
--- /dev/null
+++ b/build/talend.studio.tos.di.product/talend.p2.inf
@@ -0,0 +1,8 @@
+##
+# Remove root files
+##
+instructions.configure=\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse.exe);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse.ini);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipsec.exe);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/artifacts.xml);
diff --git a/talend.studio.tos.di.product/talend.product b/build/talend.studio.tos.di.product/talend.product
similarity index 100%
rename from talend.studio.tos.di.product/talend.product
rename to build/talend.studio.tos.di.product/talend.product
diff --git a/pom.xml b/pom.xml
index f7cf2e0..dec13e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 		<profile>
 			<id>talend.tos.products</id>
 			<modules>
-				<module>talend.studio.tos.di.product</module>
+				<module>build/talend.studio.tos.di.product</module>
 			</modules>
 		</profile>
 	</profiles>
diff --git a/talend.studio.parent.pom/pom.xml b/talend.studio.parent.pom/pom.xml
index 73da77a..f5844be 100644
--- a/talend.studio.parent.pom/pom.xml
+++ b/talend.studio.parent.pom/pom.xml
@@ -17,7 +17,7 @@
 
 	<distributionManagement>
 		<repository>
-			<id>snapshots</id>
+			<id>talend_nexus_snapshots</id>
 			<url>http://newbuild.talend.com:8081/nexus/content/repositories/snapshots/</url>
 			<snapshots><enabled>true</enabled></snapshots>
 			<releases><enabled>false</enabled></releases>
@@ -120,6 +120,9 @@
 				<configuration>
 					<strictBinIncludes>false</strictBinIncludes>
 					<format>yyyyMMdd'_'HHmm</format>
+					<archive>
+						<addMavenDescriptor>false</addMavenDescriptor>
+					</archive>
 				</configuration>
 			</plugin>      
 		</plugins>
diff --git a/talend.studio.tos.di.product/talend.p2.inf b/talend.studio.tos.di.product/talend.p2.inf
deleted file mode 100644
index 0636893..0000000
--- a/talend.studio.tos.di.product/talend.p2.inf
+++ /dev/null
@@ -1,7 +0,0 @@
-##
-# Remove root files
-##
-#instructions.configure=\
-    org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse.exe);\
-	org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse.ini);\
-    org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipsec.exe);