diff --git a/org.eclipse.virgo.site/build.gradle b/org.eclipse.virgo.site/build.gradle
index 7d375ad..063d650 100644
--- a/org.eclipse.virgo.site/build.gradle
+++ b/org.eclipse.virgo.site/build.gradle
@@ -121,12 +121,11 @@
 
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.aspectj.weaver", version: aspectjVersion, ext: "jar"
 
-    // TODO - rename feature to region'_'
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.equinox.regions')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.equinox.region.feature')
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.region", version: equinoxRegionVersion, configuration: "compile", ext: "jar"
 
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.core')
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.ds')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.core.feature')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.ds.feature')
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.common", version: equinoxCommonVersion, configuration: "compile", ext: "jar"
@@ -135,9 +134,9 @@
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.util", version: equinoxUtilVersion, configuration: "compile", ext: "jar"
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.cm", version: equinoxCmVersion, configuration: "compile", ext: "jar"
 
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.kernel')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.kernel.feature')
 
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.equinox.http.jetty')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.equinox.http.jetty.feature')
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.http.jetty", version: equinoxHttpJettyVersion, configuration: "compile", ext: "jar"
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.http.servlet", version: equinoxHttpServletVersion, configuration: "compile", ext: "jar"
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jetty.continuation", version: jettyVersion, configuration: "compile", ext: "jar"
@@ -150,23 +149,23 @@
 
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.servlet", version: javaxServletVersion, configuration: "runtime", ext: "jar"
 
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.kernel.springintegration')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.kernel.springintegration.feature')
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.springframework.expression", version: springframeworkVersion, ext: "jar"
 
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.management')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.management.feature')
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "osgi.enterprise", version: osgiEnterpriseVersion, configuration: "compile", ext: "jar"
     // contains org.osgi.jmx
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.gemini.management", version: geminiManagementVersion, configuration: "compile", ext: "jar"
 
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.medic')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.medic.feature')
     signedExternalPlugin group: "ch.qos.logback", name: "logback-core", version: logbackVersion
     signedExternalPlugin group: "ch.qos.logback", name: "logback-classic", version: logbackVersion
 
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.nano.deployer')
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.nano.mbeans')
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.nano.mbeans.controller')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.nano.deployer.feature')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.nano.mbeans.feature')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.nano.mbeans.controller.feature')
 
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.shell')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.shell.feature')
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.console", version: equinoxConsoleVersion, configuration: "compile", ext: "jar"
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.console.ssh", version: equinoxConsoleSshVersion, configuration: "compile", ext: "jar"
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.mina.core", version: minaCoreVersion, configuration: "compile", ext: "jar"
@@ -175,14 +174,13 @@
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.felix.gogo.runtime", version: gogoRuntimeVersion, configuration: "compile", ext: "jar"
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.felix.gogo.shell", version: gogoShellVersion, configuration: "compile", ext: "jar"
 
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.simpleconfigurator')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.simpleconfigurator.feature')
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.simpleconfigurator", version: equinoxSimpleConfiguratorVersion, configuration: "compile", ext: "jar"
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.simpleconfigurator.manipulator", version: equinoxSimpleConfiguratorManipulatorVersion, configuration: "compile", ext: "jar"
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.frameworkadmin", version: equinoxFrameworkadminVersion, configuration: "compile", ext: "jar"
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.frameworkadmin.equinox", version: equinoxFrameworkadminEquinoxVersion, configuration: "compile", ext: "jar"
 
-    // TODO - rename feature to org.eclipse.gemini.blueprint
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.springdm')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.gemini.blueprint.feature')
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "oevm.org.aopalliance", version: orgAopAllianceVersion, ext: "jar"
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.springframework.aop", version: springframeworkVersion, ext: "jar"
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.springframework.beans", version: springframeworkVersion, ext: "jar"
@@ -194,18 +192,18 @@
 
     // nano base
     // TODO - merge to oev.nano.services ?
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.services.concurrent')
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.services.ds')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.services.concurrent.feature')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.services.ds.feature')
 
     // TODO - merge with management features above?
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.webconsole.deps')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.webconsole.deps.feature')
 
     signedExternalPlugin group: "commons-fileupload", name: "commons-fileupload", version: commonsFileuploadVersion, ext: "jar"
     signedExternalPlugin group: "commons-io", name: "commons-io", version: commonsIoVersion, ext: "jar"
     signedExternalPlugin group: "org.jolokia", name: "jolokia-osgi", version: jolokiaVersion, ext: "jar"
 
     // nano full
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.p2.provisioning')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.p2.provisioning.feature')
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.core.contenttype", version: eclipseCoreContenttypeVersion, configuration: "compile", ext: "jar"
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.core.jobs", version: eclipseCoreJobsVersion, configuration: "compile", ext: "jar"
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.core.net", version: eclipseCoreNetVersion, configuration: "compile", ext: "jar"
@@ -238,9 +236,9 @@
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.p2.touchpoint.natives", version: p2TouchpointNativesVersion, configuration: "compile", ext: "jar"
     signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.p2.transport.ecf", version: p2TransportEcfVersion, configuration: "compile", ext: "jar"
 
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.nano.war.deployer')
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.enterprise')
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.gemini.web')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.nano.war.deployer.feature')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.enterprise.feature')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.gemini.web.feature')
     signedExternalPlugin group: "org.eclipse.gemini", name: "org.eclipse.gemini.web.core", version: geminiWebVersion, configuration: "compile", ext: "jar"
     signedExternalPlugin group: "org.eclipse.gemini", name: "org.eclipse.gemini.web.extender", version: geminiWebVersion, configuration: "compile", ext: "jar"
     signedExternalPlugin group: "org.eclipse.gemini", name: "org.eclipse.gemini.web.tomcat", version: geminiWebVersion, configuration: "compile", ext: "jar"
@@ -360,7 +358,7 @@
     signedExternalPlugin project(':web:org.eclipse.virgo.web.enterprise.services.accessor')
     signedExternalPlugin project(':web:org.eclipse.virgo.web.war.deployer')
 
-    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.tools')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.tools.feature')
 }
 
 task zipUpdateSite(type: Zip, dependsOn: createP2Repository) {
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/build.gradle b/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty.feature/build.gradle
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/build.gradle
rename to org.eclipse.virgo.site/org.eclipse.equinox.http.jetty.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/build.properties b/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty.feature/build.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/build.properties
rename to org.eclipse.virgo.site/org.eclipse.equinox.http.jetty.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/eclipse_update_120.jpg
rename to org.eclipse.virgo.site/org.eclipse.equinox.http.jetty.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/epl-v10.html
rename to org.eclipse.virgo.site/org.eclipse.equinox.http.jetty.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/feature.properties b/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.equinox.http.jetty.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/feature.xml b/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.equinox.http.jetty.feature/feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/license.html b/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty.feature/license.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/license.html
rename to org.eclipse.virgo.site/org.eclipse.equinox.http.jetty.feature/license.html
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.regions/build.gradle b/org.eclipse.virgo.site/org.eclipse.equinox.region.feature/build.gradle
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.equinox.regions/build.gradle
rename to org.eclipse.virgo.site/org.eclipse.equinox.region.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.regions/build.properties b/org.eclipse.virgo.site/org.eclipse.equinox.region.feature/build.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.equinox.regions/build.properties
rename to org.eclipse.virgo.site/org.eclipse.equinox.region.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.regions/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.equinox.region.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.equinox.regions/eclipse_update_120.jpg
rename to org.eclipse.virgo.site/org.eclipse.equinox.region.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.regions/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.equinox.region.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.equinox.regions/epl-v10.html
rename to org.eclipse.virgo.site/org.eclipse.equinox.region.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.regions/feature.properties b/org.eclipse.virgo.site/org.eclipse.equinox.region.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.equinox.regions/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.equinox.region.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.regions/feature.xml b/org.eclipse.virgo.site/org.eclipse.equinox.region.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.equinox.regions/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.equinox.region.feature/feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.gemini.web/build.gradle b/org.eclipse.virgo.site/org.eclipse.gemini.blueprint.feature/build.gradle
similarity index 100%
copy from org.eclipse.virgo.site/org.eclipse.gemini.web/build.gradle
copy to org.eclipse.virgo.site/org.eclipse.gemini.blueprint.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.gemini.web/build.properties b/org.eclipse.virgo.site/org.eclipse.gemini.blueprint.feature/build.properties
similarity index 100%
copy from org.eclipse.virgo.site/org.eclipse.gemini.web/build.properties
copy to org.eclipse.virgo.site/org.eclipse.gemini.blueprint.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.gemini.web/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.gemini.blueprint.feature/eclipse_update_120.jpg
similarity index 100%
copy from org.eclipse.virgo.site/org.eclipse.gemini.web/eclipse_update_120.jpg
copy to org.eclipse.virgo.site/org.eclipse.gemini.blueprint.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.gemini.web/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.gemini.blueprint.feature/epl-v10.html
similarity index 100%
copy from org.eclipse.virgo.site/org.eclipse.gemini.web/epl-v10.html
copy to org.eclipse.virgo.site/org.eclipse.gemini.blueprint.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.springdm/feature.properties b/org.eclipse.virgo.site/org.eclipse.gemini.blueprint.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.springdm/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.gemini.blueprint.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.springdm/feature.xml b/org.eclipse.virgo.site/org.eclipse.gemini.blueprint.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.springdm/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.gemini.blueprint.feature/feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.gemini.web/license.html b/org.eclipse.virgo.site/org.eclipse.gemini.blueprint.feature/license.html
similarity index 100%
copy from org.eclipse.virgo.site/org.eclipse.gemini.web/license.html
copy to org.eclipse.virgo.site/org.eclipse.gemini.blueprint.feature/license.html
diff --git a/org.eclipse.virgo.site/org.eclipse.gemini.web/build.gradle b/org.eclipse.virgo.site/org.eclipse.gemini.web.feature/build.gradle
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.gemini.web/build.gradle
rename to org.eclipse.virgo.site/org.eclipse.gemini.web.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.gemini.web/build.properties b/org.eclipse.virgo.site/org.eclipse.gemini.web.feature/build.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.gemini.web/build.properties
rename to org.eclipse.virgo.site/org.eclipse.gemini.web.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.gemini.web/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.gemini.web.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.gemini.web/eclipse_update_120.jpg
rename to org.eclipse.virgo.site/org.eclipse.gemini.web.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.gemini.web/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.gemini.web.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.gemini.web/epl-v10.html
rename to org.eclipse.virgo.site/org.eclipse.gemini.web.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.gemini.web/feature.properties b/org.eclipse.virgo.site/org.eclipse.gemini.web.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.gemini.web/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.gemini.web.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.gemini.web/feature.xml b/org.eclipse.virgo.site/org.eclipse.gemini.web.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.gemini.web/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.gemini.web.feature/feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.gemini.web/license.html b/org.eclipse.virgo.site/org.eclipse.gemini.web.feature/license.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.gemini.web/license.html
rename to org.eclipse.virgo.site/org.eclipse.gemini.web.feature/license.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.core/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.core.feature/build.gradle
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.core/build.gradle
rename to org.eclipse.virgo.site/org.eclipse.virgo.core.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.core/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.core.feature/build.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.core/build.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.core.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.core/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.core.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.core/eclipse_update_120.jpg
rename to org.eclipse.virgo.site/org.eclipse.virgo.core.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.core/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.core.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.core/epl-v10.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.core.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.core/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.core.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.core/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.core.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.core/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.core.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.core/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.virgo.core.feature/feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.core/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.core.feature/license.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.core/license.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.core.feature/license.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.core/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.ds.feature/build.gradle
similarity index 100%
copy from org.eclipse.virgo.site/org.eclipse.virgo.core/build.gradle
copy to org.eclipse.virgo.site/org.eclipse.virgo.ds.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.ds/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.ds.feature/build.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.ds/build.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.ds.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.core/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.ds.feature/eclipse_update_120.jpg
similarity index 100%
copy from org.eclipse.virgo.site/org.eclipse.virgo.core/eclipse_update_120.jpg
copy to org.eclipse.virgo.site/org.eclipse.virgo.ds.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.core/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.ds.feature/epl-v10.html
similarity index 100%
copy from org.eclipse.virgo.site/org.eclipse.virgo.core/epl-v10.html
copy to org.eclipse.virgo.site/org.eclipse.virgo.ds.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.ds/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.ds.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.ds/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.ds.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.ds/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.ds.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.ds/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.virgo.ds.feature/feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.core/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.ds.feature/license.html
similarity index 100%
copy from org.eclipse.virgo.site/org.eclipse.virgo.core/license.html
copy to org.eclipse.virgo.site/org.eclipse.virgo.ds.feature/license.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.ds/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.ds/build.gradle
deleted file mode 100644
index 32bcbb5..0000000
--- a/org.eclipse.virgo.site/org.eclipse.virgo.ds/build.gradle
+++ /dev/null
@@ -1 +0,0 @@
-apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.ds/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.ds/eclipse_update_120.jpg
deleted file mode 100755
index bfdf708..0000000
--- a/org.eclipse.virgo.site/org.eclipse.virgo.ds/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.ds/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.ds/epl-v10.html
deleted file mode 100755
index eecc800..0000000
--- a/org.eclipse.virgo.site/org.eclipse.virgo.ds/epl-v10.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<TITLE>Eclipse Public License - Version 1.0</TITLE>
-<STYLE type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </STYLE>
-
-</HEAD><BODY lang="EN-US">
-
-<H2>Eclipse Public License - v 1.0</H2>
-
-<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</P>
-
-<P><B>1. DEFINITIONS</B></P>
-
-<P>"Contribution" means:</P>
-
-<P class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</P>
-<P class="list">b) in the case of each subsequent Contributor:</P>
-<P class="list">i) changes to the Program, and</P>
-<P class="list">ii) additions to the Program;</P>
-<P class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</P>
-
-<P>"Contributor" means any person or entity that distributes
-the Program.</P>
-
-<P>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</P>
-
-<P>"Program" means the Contributions distributed in accordance
-with this Agreement.</P>
-
-<P>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</P>
-
-<P><B>2. GRANT OF RIGHTS</B></P>
-
-<P class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</P>
-
-<P class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</P>
-
-<P class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</P>
-
-<P class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</P>
-
-<P><B>3. REQUIREMENTS</B></P>
-
-<P>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</P>
-
-<P class="list">a) it complies with the terms and conditions of this
-Agreement; and</P>
-
-<P class="list">b) its license agreement:</P>
-
-<P class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</P>
-
-<P class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</P>
-
-<P class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</P>
-
-<P class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</P>
-
-<P>When the Program is made available in source code form:</P>
-
-<P class="list">a) it must be made available under this Agreement; and</P>
-
-<P class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</P>
-
-<P>Contributors may not remove or alter any copyright notices contained
-within the Program.</P>
-
-<P>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</P>
-
-<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
-
-<P>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</P>
-
-<P>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</P>
-
-<P><B>5. NO WARRANTY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</P>
-
-<P><B>6. DISCLAIMER OF LIABILITY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
-
-<P><B>7. GENERAL</B></P>
-
-<P>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</P>
-
-<P>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</P>
-
-<P>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</P>
-
-<P>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</P>
-
-<P>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</P>
-
-
-
-
-</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.ds/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.ds/license.html
deleted file mode 100755
index f19c483..0000000
--- a/org.eclipse.virgo.site/org.eclipse.virgo.ds/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/build.gradle
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.enterprise/build.gradle
rename to org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/build.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.enterprise/build.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.enterprise/eclipse_update_120.jpg
rename to org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.enterprise/epl-v10.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.enterprise/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.enterprise/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/feature.xml
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/license.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.enterprise/license.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/license.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.feature/build.gradle
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.kernel/build.gradle
rename to org.eclipse.virgo.site/org.eclipse.virgo.kernel.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.feature/build.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.kernel/build.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.kernel.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.kernel/eclipse_update_120.jpg
rename to org.eclipse.virgo.site/org.eclipse.virgo.kernel.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.kernel/epl-v10.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.kernel.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.kernel/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.kernel.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.kernel/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.virgo.kernel.feature/feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration.feature/build.gradle
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/build.gradle
rename to org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration.feature/build.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/build.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/eclipse_update_120.jpg
rename to org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/epl-v10.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration.feature/feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.management/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.management.feature/build.gradle
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.management/build.gradle
rename to org.eclipse.virgo.site/org.eclipse.virgo.management.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.management/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.management.feature/build.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.management/build.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.management.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.management/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.management.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.management/eclipse_update_120.jpg
rename to org.eclipse.virgo.site/org.eclipse.virgo.management.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.management/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.management.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.management/epl-v10.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.management.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.management/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.management.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.management/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.management.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.management/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.management.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.management/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.virgo.management.feature/feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.medic/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.medic.feature/build.gradle
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.medic/build.gradle
rename to org.eclipse.virgo.site/org.eclipse.virgo.medic.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.medic/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.medic.feature/build.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.medic/build.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.medic.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.medic/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.medic.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.medic/eclipse_update_120.jpg
rename to org.eclipse.virgo.site/org.eclipse.virgo.medic.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.medic/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.medic.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.medic/epl-v10.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.medic.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.medic/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.medic.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.medic/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.medic.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.medic/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.medic.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.medic/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.virgo.medic.feature/feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.medic/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.medic.feature/license.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.medic/license.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.medic.feature/license.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer.feature/build.gradle
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/build.gradle
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer.feature/build.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/build.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/eclipse_update_120.jpg
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/epl-v10.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer.feature/feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer.feature/license.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/license.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer.feature/license.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller.feature/build.gradle
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/build.gradle
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller.feature/build.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/build.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/eclipse_update_120.jpg
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/epl-v10.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller.feature/feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller.feature/license.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/license.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller.feature/license.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.feature/build.gradle
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/build.gradle
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.feature/build.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/build.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/eclipse_update_120.jpg
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/epl-v10.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.feature/feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.feature/license.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/license.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.feature/license.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer.feature/build.gradle
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/build.gradle
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer.feature/build.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/build.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/eclipse_update_120.jpg
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/epl-v10.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer.feature/feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer.feature/license.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/license.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer.feature/license.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning.feature/build.gradle
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/build.gradle
rename to org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning.feature/build.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/build.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/eclipse_update_120.jpg
rename to org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/epl-v10.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning.feature/feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning.feature/license.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/license.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning.feature/license.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent.feature/build.gradle
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/build.gradle
rename to org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent.feature/build.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/build.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/eclipse_update_120.jpg
rename to org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/epl-v10.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent.feature/feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent.feature/license.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/license.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent.feature/license.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.services.ds.feature/build.gradle
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.services.ds/build.gradle
rename to org.eclipse.virgo.site/org.eclipse.virgo.services.ds.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.services.ds.feature/build.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.services.ds/build.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.services.ds.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.services.ds.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.services.ds/eclipse_update_120.jpg
rename to org.eclipse.virgo.site/org.eclipse.virgo.services.ds.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.services.ds.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.services.ds/epl-v10.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.services.ds.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.services.ds.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.services.ds/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.services.ds.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.services.ds.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.services.ds/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.virgo.services.ds.feature/feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.services.ds.feature/license.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.services.ds/license.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.services.ds.feature/license.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.shell/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.shell.feature/build.gradle
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.shell/build.gradle
rename to org.eclipse.virgo.site/org.eclipse.virgo.shell.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.shell/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.shell.feature/build.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.shell/build.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.shell.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.shell/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.shell.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.shell/eclipse_update_120.jpg
rename to org.eclipse.virgo.site/org.eclipse.virgo.shell.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.shell/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.shell.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.shell/epl-v10.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.shell.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.shell/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.shell.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.shell/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.shell.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.shell/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.shell.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.shell/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.virgo.shell.feature/feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.shell/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.shell.feature/license.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.shell/license.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.shell.feature/license.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator.feature/build.gradle
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/build.gradle
rename to org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator.feature/build.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/build.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/eclipse_update_120.jpg
rename to org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/epl-v10.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator.feature/feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator.feature/license.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/license.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator.feature/license.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.springdm/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.springdm/build.gradle
deleted file mode 100644
index 32bcbb5..0000000
--- a/org.eclipse.virgo.site/org.eclipse.virgo.springdm/build.gradle
+++ /dev/null
@@ -1 +0,0 @@
-apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.springdm/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.springdm/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/org.eclipse.virgo.site/org.eclipse.virgo.springdm/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.springdm/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.springdm/eclipse_update_120.jpg
deleted file mode 100755
index bfdf708..0000000
--- a/org.eclipse.virgo.site/org.eclipse.virgo.springdm/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.springdm/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.springdm/epl-v10.html
deleted file mode 100755
index eecc800..0000000
--- a/org.eclipse.virgo.site/org.eclipse.virgo.springdm/epl-v10.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<TITLE>Eclipse Public License - Version 1.0</TITLE>
-<STYLE type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </STYLE>
-
-</HEAD><BODY lang="EN-US">
-
-<H2>Eclipse Public License - v 1.0</H2>
-
-<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</P>
-
-<P><B>1. DEFINITIONS</B></P>
-
-<P>"Contribution" means:</P>
-
-<P class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</P>
-<P class="list">b) in the case of each subsequent Contributor:</P>
-<P class="list">i) changes to the Program, and</P>
-<P class="list">ii) additions to the Program;</P>
-<P class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</P>
-
-<P>"Contributor" means any person or entity that distributes
-the Program.</P>
-
-<P>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</P>
-
-<P>"Program" means the Contributions distributed in accordance
-with this Agreement.</P>
-
-<P>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</P>
-
-<P><B>2. GRANT OF RIGHTS</B></P>
-
-<P class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</P>
-
-<P class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</P>
-
-<P class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</P>
-
-<P class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</P>
-
-<P><B>3. REQUIREMENTS</B></P>
-
-<P>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</P>
-
-<P class="list">a) it complies with the terms and conditions of this
-Agreement; and</P>
-
-<P class="list">b) its license agreement:</P>
-
-<P class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</P>
-
-<P class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</P>
-
-<P class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</P>
-
-<P class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</P>
-
-<P>When the Program is made available in source code form:</P>
-
-<P class="list">a) it must be made available under this Agreement; and</P>
-
-<P class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</P>
-
-<P>Contributors may not remove or alter any copyright notices contained
-within the Program.</P>
-
-<P>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</P>
-
-<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
-
-<P>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</P>
-
-<P>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</P>
-
-<P><B>5. NO WARRANTY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</P>
-
-<P><B>6. DISCLAIMER OF LIABILITY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
-
-<P><B>7. GENERAL</B></P>
-
-<P>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</P>
-
-<P>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</P>
-
-<P>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</P>
-
-<P>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</P>
-
-<P>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</P>
-
-
-
-
-</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.springdm/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.springdm/license.html
deleted file mode 100755
index f19c483..0000000
--- a/org.eclipse.virgo.site/org.eclipse.virgo.springdm/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.tools/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.tools.feature/build.gradle
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.tools/build.gradle
rename to org.eclipse.virgo.site/org.eclipse.virgo.tools.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.tools/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.tools.feature/build.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.tools/build.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.tools.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.tools/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.tools.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.tools/eclipse_update_120.jpg
rename to org.eclipse.virgo.site/org.eclipse.virgo.tools.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.tools/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.tools.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.tools/epl-v10.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.tools.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.tools/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.tools.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.tools/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.tools.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.tools/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.tools.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.tools/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.virgo.tools.feature/feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.tools/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.tools.feature/license.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.tools/license.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.tools.feature/license.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps.feature/build.gradle
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/build.gradle
rename to org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps.feature/build.gradle
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps.feature/build.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/build.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps.feature/build.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps.feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/eclipse_update_120.jpg
rename to org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps.feature/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/epl-v10.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps.feature/epl-v10.html
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps.feature/feature.properties
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/feature.properties
rename to org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps.feature/feature.properties
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps.feature/feature.xml
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/feature.xml
rename to org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps.feature/feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps.feature/license.html
similarity index 100%
rename from org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/license.html
rename to org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps.feature/license.html
diff --git a/settings.gradle b/settings.gradle
index 5ebaab6..e21500d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -84,31 +84,29 @@
 //include ':medic:org.eclipse.virgo.medic.integrationtest'
 
 include ':org.eclipse.virgo.site'
-// TODO - rename feature to region'_'
-include ':org.eclipse.virgo.site:org.eclipse.equinox.regions'
-include ':org.eclipse.virgo.site:org.eclipse.equinox.http.jetty'
-include ':org.eclipse.virgo.site:org.eclipse.virgo.core'
-include ':org.eclipse.virgo.site:org.eclipse.virgo.ds'
-include ':org.eclipse.virgo.site:org.eclipse.virgo.kernel'
-include ':org.eclipse.virgo.site:org.eclipse.virgo.kernel.springintegration'
-include ':org.eclipse.virgo.site:org.eclipse.virgo.management'
-include ':org.eclipse.virgo.site:org.eclipse.virgo.medic'
-include ':org.eclipse.virgo.site:org.eclipse.virgo.nano.deployer'
-include ':org.eclipse.virgo.site:org.eclipse.virgo.nano.mbeans'
-include ':org.eclipse.virgo.site:org.eclipse.virgo.nano.mbeans.controller'
-include ':org.eclipse.virgo.site:org.eclipse.virgo.services.concurrent'
-include ':org.eclipse.virgo.site:org.eclipse.virgo.services.ds'
-include ':org.eclipse.virgo.site:org.eclipse.virgo.shell'
-include ':org.eclipse.virgo.site:org.eclipse.virgo.simpleconfigurator'
-// TODO - rename feature to org.eclipse.gemini.blueprint
-include ':org.eclipse.virgo.site:org.eclipse.virgo.springdm'
-include ':org.eclipse.virgo.site:org.eclipse.virgo.webconsole.deps'
-include ':org.eclipse.virgo.site:org.eclipse.virgo.p2.provisioning'
-include ':org.eclipse.virgo.site:org.eclipse.gemini.web'
-include ':org.eclipse.virgo.site:org.eclipse.virgo.nano.war.deployer'
-include ':org.eclipse.virgo.site:org.eclipse.virgo.enterprise'
+include ':org.eclipse.virgo.site:org.eclipse.equinox.region.feature'
+include ':org.eclipse.virgo.site:org.eclipse.equinox.http.jetty.feature'
+include ':org.eclipse.virgo.site:org.eclipse.gemini.blueprint.feature'
+include ':org.eclipse.virgo.site:org.eclipse.gemini.web.feature'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.core.feature'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.ds.feature'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.kernel.feature'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.kernel.springintegration.feature'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.management.feature'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.medic.feature'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.nano.deployer.feature'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.nano.mbeans.feature'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.nano.mbeans.controller.feature'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.services.concurrent.feature'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.services.ds.feature'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.shell.feature'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.simpleconfigurator.feature'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.webconsole.deps.feature'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.p2.provisioning.feature'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.nano.war.deployer.feature'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.enterprise.feature'
 
-include ':org.eclipse.virgo.site:org.eclipse.virgo.tools'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.tools.feature'
 
 include ':packaging:nano'
 include ':packaging:kernel'