diff --git a/README.md b/README.md
index a4747160..a4821888 100644
--- a/README.md
+++ b/README.md
@@ -37,9 +37,9 @@ First build the target platform:
       $ cd .../jbosstools-integration-stack/target-platform
       $ mvn clean install
 
-Second build either the community (jbt) or production (jbds) aggregate and Mylyn discovery:
+Second build either the community (jbosstools) or production (devstudio) aggregate and Mylyn discovery:
 
-      $ cd .../jbosstools-integration-stack/jbt
+      $ cd .../jbosstools-integration-stack/jbosstools
       $ mvn clean install
 
 Then look for the integration-stack-*.zip file in your repository.  You can use that zip file directly as your install 
diff --git a/jbds/discovery/plugin/.gitignore b/devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/.gitignore
similarity index 100%
rename from jbds/discovery/plugin/.gitignore
rename to devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/.gitignore
diff --git a/jbds/discovery/plugin/META-INF/MANIFEST.MF b/devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/META-INF/MANIFEST.MF
similarity index 100%
rename from jbds/discovery/plugin/META-INF/MANIFEST.MF
rename to devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/META-INF/MANIFEST.MF
diff --git a/jbds/discovery/plugin/build.properties b/devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/build.properties
similarity index 100%
rename from jbds/discovery/plugin/build.properties
rename to devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/build.properties
diff --git a/jbds/discovery/plugin/images/jbds_bpel_32.png b/devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/images/jbds_bpel_32.png
similarity index 100%
rename from jbds/discovery/plugin/images/jbds_bpel_32.png
rename to devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/images/jbds_bpel_32.png
diff --git a/jbds/discovery/plugin/images/jbds_drools_32.png b/devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/images/jbds_drools_32.png
similarity index 100%
rename from jbds/discovery/plugin/images/jbds_drools_32.png
rename to devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/images/jbds_drools_32.png
diff --git a/jbds/discovery/plugin/images/jbds_esb_32.png b/devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/images/jbds_esb_32.png
similarity index 100%
rename from jbds/discovery/plugin/images/jbds_esb_32.png
rename to devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/images/jbds_esb_32.png
diff --git a/jbds/discovery/plugin/images/jbds_guvnor_32.png b/devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/images/jbds_guvnor_32.png
similarity index 100%
rename from jbds/discovery/plugin/images/jbds_guvnor_32.png
rename to devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/images/jbds_guvnor_32.png
diff --git a/jbds/discovery/plugin/images/jbds_icon32.png b/devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/images/jbds_icon32.png
similarity index 100%
rename from jbds/discovery/plugin/images/jbds_icon32.png
rename to devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/images/jbds_icon32.png
diff --git a/jbds/discovery/plugin/images/jbds_jbpm_32.png b/devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/images/jbds_jbpm_32.png
similarity index 100%
rename from jbds/discovery/plugin/images/jbds_jbpm_32.png
rename to devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/images/jbds_jbpm_32.png
diff --git a/jbds/discovery/plugin/images/jbds_modeshape_32.png b/devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/images/jbds_modeshape_32.png
similarity index 100%
rename from jbds/discovery/plugin/images/jbds_modeshape_32.png
rename to devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/images/jbds_modeshape_32.png
diff --git a/jbds/discovery/plugin/images/jbds_soa-p_brms.png b/devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/images/jbds_soa-p_brms.png
similarity index 100%
rename from jbds/discovery/plugin/images/jbds_soa-p_brms.png
rename to devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/images/jbds_soa-p_brms.png
diff --git a/jbds/discovery/plugin/images/jbds_tdesigner_32.png b/devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/images/jbds_tdesigner_32.png
similarity index 100%
rename from jbds/discovery/plugin/images/jbds_tdesigner_32.png
rename to devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/images/jbds_tdesigner_32.png
diff --git a/jbds/discovery/plugin/images/redhat_48.png b/devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/images/redhat_48.png
similarity index 100%
rename from jbds/discovery/plugin/images/redhat_48.png
rename to devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/images/redhat_48.png
diff --git a/jbds/discovery/plugin/plugin.properties b/devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/plugin.properties
similarity index 100%
rename from jbds/discovery/plugin/plugin.properties
rename to devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/plugin.properties
diff --git a/jbds/discovery/plugin/plugin.xml b/devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/plugin.xml
similarity index 100%
rename from jbds/discovery/plugin/plugin.xml
rename to devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/plugin.xml
diff --git a/jbds/discovery/plugin/pom.xml b/devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/pom.xml
similarity index 100%
rename from jbds/discovery/plugin/pom.xml
rename to devstudio/discovery/com.jboss.jbds.central.discovery.integration-stack/pom.xml
diff --git a/jbds/discovery/generation/pom.xml b/devstudio/discovery/generation/pom.xml
similarity index 91%
rename from jbds/discovery/generation/pom.xml
rename to devstudio/discovery/generation/pom.xml
index 66731818..b02cf3ac 100644
--- a/jbds/discovery/generation/pom.xml
+++ b/devstudio/discovery/generation/pom.xml
@@ -41,10 +41,9 @@
 		  <property name="BUILD_ID" value="${BUILD_ID}" />
 		  <property name="BUILD_NUMBER" value="${BUILD_NUMBER}" />
 		  <property name="BUILD_TS" value="${BUILD_TS}" />
+		  <property name="BUILD_FORM" value="production" />
 		  <property name="BUILD_TYPE" value="${BUILD_TYPE}" />
 		  <property name="TARGET_PLATFORM" value="${TARGET_PLATFORM}" />
-		  <property name="central.discovery.is.jar.id" value="com.jboss.jbds.central.discovery.integration-stack-${VERSION}-SNAPSHOT.jar" />
-		  <property name="output.url" value="https://devstudio.jboss.com/updates/${BUILD_TYPE}/central/integration-stack/${VERSION}/" />
 		</ant>
 	      </target>
 	    </configuration>
diff --git a/jbds/discovery/pom.xml b/devstudio/discovery/pom.xml
similarity index 98%
rename from jbds/discovery/pom.xml
rename to devstudio/discovery/pom.xml
index 54e5fb60..023a1d9c 100644
--- a/jbds/discovery/pom.xml
+++ b/devstudio/discovery/pom.xml
@@ -27,7 +27,7 @@
   </description>
 
   <modules>
-    <module>plugin</module>
+    <module>com.jboss.jbds.central.discovery.integration-stack</module>
     <module>generation</module>
   </modules>
 
diff --git a/jbds/pom.xml b/devstudio/pom.xml
similarity index 100%
rename from jbds/pom.xml
rename to devstudio/pom.xml
diff --git a/jbds/site/category.xml b/devstudio/site/category.xml
similarity index 100%
rename from jbds/site/category.xml
rename to devstudio/site/category.xml
diff --git a/jbds/site/compositeArtifacts.xml b/devstudio/site/compositeArtifacts.xml
similarity index 100%
rename from jbds/site/compositeArtifacts.xml
rename to devstudio/site/compositeArtifacts.xml
diff --git a/jbds/site/compositeContent.xml b/devstudio/site/compositeContent.xml
similarity index 100%
rename from jbds/site/compositeContent.xml
rename to devstudio/site/compositeContent.xml
diff --git a/jbds/site/pom.xml b/devstudio/site/pom.xml
similarity index 99%
rename from jbds/site/pom.xml
rename to devstudio/site/pom.xml
index bc848fbb..5fee5bd2 100644
--- a/jbds/site/pom.xml
+++ b/devstudio/site/pom.xml
@@ -11,7 +11,7 @@
     <version>6.0.0-SNAPSHOT</version>
   </parent>
 
-  <name>JBDS Integration Stack Master</name>
+  <name>JBDS Integration Stack Aggregate</name>
   <packaging>eclipse-repository</packaging>
 
   <description>
diff --git a/jbds/site/siteTemplateFolder/index.html b/devstudio/site/siteTemplateFolder/index.html
similarity index 100%
rename from jbds/site/siteTemplateFolder/index.html
rename to devstudio/site/siteTemplateFolder/index.html
diff --git a/jbt/discovery/generation/pom.xml b/jbosstools/discovery/generation/pom.xml
similarity index 91%
rename from jbt/discovery/generation/pom.xml
rename to jbosstools/discovery/generation/pom.xml
index b3105405..48133675 100644
--- a/jbt/discovery/generation/pom.xml
+++ b/jbosstools/discovery/generation/pom.xml
@@ -41,10 +41,9 @@
 		  <property name="BUILD_ID" value="${BUILD_ID}" />
 		  <property name="BUILD_NUMBER" value="${BUILD_NUMBER}" />
 		  <property name="BUILD_TS" value="${BUILD_TS}" />
+		  <property name="BUILD_FORM" value="community" />
 		  <property name="BUILD_TYPE" value="${BUILD_TYPE}" />
 		  <property name="TARGET_PLATFORM" value="${TARGET_PLATFORM}" />
-		  <property name="central.discovery.is.jar.id" value="org.jboss.tools.central.discovery.integration-stack-${VERSION}-SNAPSHOT.jar" />
-		  <property name="output.url" value="http://download.jboss.org/jbosstools/discovery/${BUILD_TYPE}/integration-stack/${VERSION}/" />
 		</ant>
 	      </target>
 	    </configuration>
diff --git a/jbt/discovery/plugin/.gitignore b/jbosstools/discovery/org.jboss.tools.central.discovery.integration-stack/.gitignore
similarity index 100%
rename from jbt/discovery/plugin/.gitignore
rename to jbosstools/discovery/org.jboss.tools.central.discovery.integration-stack/.gitignore
diff --git a/jbt/discovery/plugin/META-INF/MANIFEST.MF b/jbosstools/discovery/org.jboss.tools.central.discovery.integration-stack/META-INF/MANIFEST.MF
similarity index 100%
rename from jbt/discovery/plugin/META-INF/MANIFEST.MF
rename to jbosstools/discovery/org.jboss.tools.central.discovery.integration-stack/META-INF/MANIFEST.MF
diff --git a/jbt/discovery/plugin/build.properties b/jbosstools/discovery/org.jboss.tools.central.discovery.integration-stack/build.properties
similarity index 100%
rename from jbt/discovery/plugin/build.properties
rename to jbosstools/discovery/org.jboss.tools.central.discovery.integration-stack/build.properties
diff --git a/jbt/discovery/plugin/images/jbosstools_icon32.png b/jbosstools/discovery/org.jboss.tools.central.discovery.integration-stack/images/jbosstools_icon32.png
similarity index 100%
rename from jbt/discovery/plugin/images/jbosstools_icon32.png
rename to jbosstools/discovery/org.jboss.tools.central.discovery.integration-stack/images/jbosstools_icon32.png
diff --git a/jbt/discovery/plugin/plugin.properties b/jbosstools/discovery/org.jboss.tools.central.discovery.integration-stack/plugin.properties
similarity index 100%
rename from jbt/discovery/plugin/plugin.properties
rename to jbosstools/discovery/org.jboss.tools.central.discovery.integration-stack/plugin.properties
diff --git a/jbt/discovery/plugin/plugin.xml b/jbosstools/discovery/org.jboss.tools.central.discovery.integration-stack/plugin.xml
similarity index 89%
rename from jbt/discovery/plugin/plugin.xml
rename to jbosstools/discovery/org.jboss.tools.central.discovery.integration-stack/plugin.xml
index d184b222..d8763606 100644
--- a/jbt/discovery/plugin/plugin.xml
+++ b/jbosstools/discovery/org.jboss.tools.central.discovery.integration-stack/plugin.xml
@@ -69,15 +69,9 @@
        provider="JBoss by Red Hat"
        siteUrl="%jboss.is.update.url"
        name="Fuse Development"
-       description="Tools related to integrating software components with the Fuse IDE that work with Apache ServiceMix, ActiveMQ and Camel - support for jBPM 5, Drools and Guvnor."
+       description="Tools related to integrating software components with the Fuse IDE that work with Apache ServiceMix, ActiveMQ and Camel."
        id="jboss.integration-stack.bundle.fuse">
       <iu id="org.fusesource.ide.feature"/>
-      <iu id="org.drools.eclipse.feature"/>
-      <iu id="org.jboss.tools.runtime.drools.detector.feature"/>
-      <iu id="org.guvnor.tools.feature"/>
-      <iu id="org.jbpm.eclipse.feature"/>
-      <iu id="org.jbpm.eclipse.task.feature"/>
-      <iu id="org.jboss.tools.runtime.jbpm.detector.feature"/>
       <icon
 	 image32="images/jbosstools_icon32.png">
       </icon>
diff --git a/jbt/discovery/plugin/pom.xml b/jbosstools/discovery/org.jboss.tools.central.discovery.integration-stack/pom.xml
similarity index 95%
rename from jbt/discovery/plugin/pom.xml
rename to jbosstools/discovery/org.jboss.tools.central.discovery.integration-stack/pom.xml
index a9c80644..0579314d 100644
--- a/jbt/discovery/plugin/pom.xml
+++ b/jbosstools/discovery/org.jboss.tools.central.discovery.integration-stack/pom.xml
@@ -14,7 +14,7 @@
 
   <name>JBoss Tools Integration Stack Discovery Plugins</name>
 
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-plugin</packaging> 
 
   <build>
     <resources>
diff --git a/jbt/discovery/pom.xml b/jbosstools/discovery/pom.xml
similarity index 98%
rename from jbt/discovery/pom.xml
rename to jbosstools/discovery/pom.xml
index af344503..201ffb41 100644
--- a/jbt/discovery/pom.xml
+++ b/jbosstools/discovery/pom.xml
@@ -16,6 +16,7 @@
   <name>JBoss Tools Integration Stack Discovery</name>
 
   <packaging>pom</packaging>
+
   <description>
     JBoss Tools Central Integration Stack discovery generation.
 
@@ -27,7 +28,7 @@
   </description>
 
   <modules>
-    <module>plugin</module>
+    <module>org.jboss.tools.central.discovery.integration-stack</module>
     <module>generation</module>
   </modules>
 
diff --git a/jbt/pom.xml b/jbosstools/pom.xml
similarity index 100%
rename from jbt/pom.xml
rename to jbosstools/pom.xml
diff --git a/jbt/site/category.xml b/jbosstools/site/category.xml
similarity index 98%
rename from jbt/site/category.xml
rename to jbosstools/site/category.xml
index f8e8b362..596e4551 100644
--- a/jbt/site/category.xml
+++ b/jbosstools/site/category.xml
@@ -34,7 +34,6 @@ Tools related to the development of Service Oriented Architecture applications -
 <!-- drools -->
 <feature url="features/org.drools.eclipse.feature_0.0.0.jar" id="org.drools.eclipse.feature" version="0.0.0">
   <category name="BusinessLogic" />
-  <category name="FuseDev" />
 </feature>
 
 <!-- esb -->
@@ -50,13 +49,11 @@ Tools related to the development of Service Oriented Architecture applications -
 <!-- guvnor -->
 <feature url="features/org.guvnor.tools.feature_0.0.0.jar" id="org.guvnor.tools.feature" version="0.0.0">
   <category name="BusinessLogic" />
-  <category name="FuseDev" />
 </feature>
 
 <!-- jbpm -->
 <feature url="features/org.jboss.tools.jbpm.convert.feature_0.0.0.jar" id="org.jboss.tools.jbpm.convert.feature" version="0.0.0">
   <category name="BusinessLogic" />
-  <category name="FuseDev" />
 </feature>
 
 <feature url="features/org.jboss.tools.jbpm.common.feature_0.0.0.jar" id="org.jboss.tools.jbpm.common.feature" version="0.0.0">
diff --git a/jbt/site/compositeArtifacts.xml b/jbosstools/site/compositeArtifacts.xml
similarity index 100%
rename from jbt/site/compositeArtifacts.xml
rename to jbosstools/site/compositeArtifacts.xml
diff --git a/jbt/site/compositeContent.xml b/jbosstools/site/compositeContent.xml
similarity index 100%
rename from jbt/site/compositeContent.xml
rename to jbosstools/site/compositeContent.xml
diff --git a/jbt/site/pom.xml b/jbosstools/site/pom.xml
similarity index 99%
rename from jbt/site/pom.xml
rename to jbosstools/site/pom.xml
index 558b6dd8..7c324749 100644
--- a/jbt/site/pom.xml
+++ b/jbosstools/site/pom.xml
@@ -11,7 +11,7 @@
     <version>4.0.0-SNAPSHOT</version>
   </parent>
 
-  <name>JBoss Tools Integration Stack Master</name>
+  <name>JBoss Tools Integration Stack Aggregate</name>
   <packaging>eclipse-repository</packaging>
 
   <description>
diff --git a/jbt/site/siteTemplateFolder/index.html b/jbosstools/site/siteTemplateFolder/index.html
similarity index 100%
rename from jbt/site/siteTemplateFolder/index.html
rename to jbosstools/site/siteTemplateFolder/index.html
diff --git a/scripts/build.xml b/scripts/build.xml
index 607607e8..776bd7e4 100644
--- a/scripts/build.xml
+++ b/scripts/build.xml
@@ -8,7 +8,7 @@
      To test output, run maven in this folder:
 
      $ mvn clean install -DPREFIX=jbosstools-integration-stack -DVERSION=4.0.0 -DBUILD_TYPE=integration -DBUILD_TS=v20130212-1234 \
-         -DBUILD_NUMBER=23 -DBUILD_ALIAS=integration -DTARGET_PLATFORM=juno
+         -DBUILD_NUMBER=23 -DBUILD_ALIAS=integration -DTARGET_PLATFORM=juno -DBUILD_FORM=production
     -->
 
   <condition property="output.dir" value="${WORKSPACE}/results" else="${basedir}">
@@ -63,7 +63,17 @@ $java.home = ${java.home}
     <echo level="debug">project.build.directory = ${project.build.directory}</echo>
 
     <!-- Extract the file name matching the integration stack discovery jar (i.e) org.jboss.tools.central.discovery.integration-stack_4.0.0.integration-v20130212-1334-B99.jar -->
-    <property name="discovery_jar_target_dir" value="${project.build.directory}/../../plugin/target/" />
+    <if><equals arg1="${BUILD_FORM}" arg2="community" trim="true" /><then>
+	<property name="central.discovery.is.jar.id" value="org.jboss.tools.central.discovery.integration-stack-${VERSION}-SNAPSHOT.jar" />
+	<property name="discovery_jar_target_dir" value="${project.build.directory}/../../org.jboss.tools.central.discovery.integration-stack/target/" />
+	<property name="output.url" value="http://download.jboss.org/jbosstools/discovery/${BUILD_TYPE}/integration-stack/${VERSION}/" />
+    </then></if>
+
+    <if><equals arg1="${BUILD_FORM}" arg2="production" trim="true" /><then>
+	<property name="central.discovery.is.jar.id" value="com.jboss.jbds.central.discovery.integration-stack-${VERSION}-SNAPSHOT.jar" />
+	<property name="discovery_jar_target_dir" value="${project.build.directory}/../../com.jboss.jbds.central.discovery.integration-stack/target/" />
+	<property name="output.url" value="https://devstudio.jboss.com/updates/${BUILD_TYPE}/central/integration-stack/${VERSION}/" />
+    </then></if>
 
     <path id="central.discovery.is.jar.id">
 	  <fileset dir="${discovery_jar_target_dir}">