diff --git a/product/plugins/com.jboss.jbds.central.discovery/plugin.xml b/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
index 080a859..dc16624 100644
--- a/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
+++ b/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
@@ -3,268 +3,152 @@
 <plugin>
 	<extension
          point="org.eclipse.mylyn.discovery.core.connectorDiscovery">
+      
+      <!-- a. Web and Mobile Development -->
+
       <connectorCategory
-            description="Plugins for working with Maven"
-            id="org.jboss.tools.central.discovery.maven"
-            name="Maven"
+            description="Plugins for web and mobile development"
+            id="org.jboss.tools.central.discovery.a.web"
+            name="Web and Mobile Development"
             relevance="60">
-            <!-- use groups to reorder items in a category; otherwise default to alpha order -->
- 			<group id="org.jboss.tools.central.discovery.maven.core" /> 
- 			<group id="org.jboss.tools.central.discovery.maven.configurators" /> 
- 			<group id="org.jboss.tools.central.discovery.maven.upstream" />
+         <group id="org.jboss.tools.central.discovery.a.web.core" /> 
+         <group id="org.jboss.tools.central.discovery.a.web.extras" />
       </connectorCategory>
       
       <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.maven"
-            groupId="org.jboss.tools.central.discovery.maven.core"
-            description="JBoss Maven Integration"
-            id="org.jboss.tools.maven.feature"
+            categoryId="org.jboss.tools.central.discovery.a.web"
+            groupId="org.jboss.tools.central.discovery.a.web.core"
+            description="JST Server Core, UI, Adapters, User Doc"
+            id="org.eclipse.jst.server_core.feature"
             kind="task"
-            license="Free, EPL"
-            name="JBoss Maven Integration"
-            provider="JBoss by Red Hat"
+            license="Free, EPL, Other"
+            name="JST Server"
+            provider="Eclipse.org"
             siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
-            <iu id="org.jboss.tools.maven.feature"/>
+            <!-- <iu id="org.eclipse.jst.server_adapters.ext.feature"/> -->
+            <iu id="org.eclipse.jst.server_adapters.feature"/>
+            <iu id="org.eclipse.jst.server_core.feature"/>
+            <iu id="org.eclipse.jst.server_ui.feature"/>
+            <iu id="org.eclipse.jst.server_userdoc.feature"/>
          <icon
-               image32="images/jbosstools_icon32.png">
+               image32="images/wtp_32.png">
          </icon>
          <overview
-               url="http://www.jboss.org/tools">
+               url="http://eclipse.org/webtools/">
          </overview>
       </connectorDescriptor>
+
       <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.maven"
-            groupId="org.jboss.tools.central.discovery.maven.configurators"
-            description="JBoss Maven CDI Configurator"
-            id="org.jboss.tools.maven.cdi.feature"
+            categoryId="org.jboss.tools.central.discovery.a.web"
+            groupId="org.jboss.tools.central.discovery.a.web.extras"
+            description="Android Development Tools, DDMS, Hierarchy Viewer, OpenGL Tracer, Traceview"
+            id="com.android.ide.eclipse.adt"
             kind="task"
-            license="Free, EPL"
-            name="JBoss Maven CDI Configurator"
-            provider="JBoss by Red Hat"
+            license="EPL, Other"
+            name="Android Development Tools"
+            provider="Google, Inc."
             siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
-            <iu id="org.jboss.tools.maven.cdi.feature"/>
+            <!-- https://issues.jboss.org/browse/JBIDE-12498 -->
+            <iu id="com.android.ide.eclipse.adt"/>
+            <iu id="com.android.ide.eclipse.ddms"/>
+            <iu id="com.android.ide.eclipse.hierarchyviewer"/>
+            <iu id="com.android.ide.eclipse.gldebugger"/>
+            <iu id="com.android.ide.eclipse.traceview"/>
+            <!-- DO NOT INCLUDE com.android.ide.eclipse.ndk feature because it requires CDT -->
          <icon
-               image32="images/jbosstools_icon32.png">
+               image32="images/android_32.png">
          </icon>
          <overview
-               url="http://www.jboss.org/tools">
+               url="http://developer.android.com/tools/sdk/eclipse-adt.html">
          </overview>
       </connectorDescriptor>
       <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.maven"
-            groupId="org.jboss.tools.central.discovery.maven.configurators"
-            description="JBoss Maven GWT Configurator"
-            id="org.jboss.tools.maven.gwt.feature"
+            categoryId="org.jboss.tools.central.discovery.a.web"
+            groupId="org.jboss.tools.central.discovery.a.web.extras"
+            description="Google Web Toolkit Designer + WindowBuilder"
+            id="com.google.gdt.eclipse.designer.editor.feature"
             kind="task"
-            license="Free, EPL"
-            name="JBoss Maven GWT Configurator"
-            provider="JBoss by Red Hat"
+            license="EPL, Other"
+            name="Google Web Toolkit Designer"
+            provider="Google, Inc."
             siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
-            <iu id="org.jboss.tools.maven.gwt.feature"/>
+            <iu id="com.jboss.jbds.gwt.designer.feature"/>
+            <iu id="com.google.gdt.eclipse.designer.editor.feature"/>
+            <iu id="com.google.gdt.eclipse.designer.gpe.feature"/>
+            <iu id="com.google.gdt.eclipse.designer.hosted.feature"/>
+            <iu id="com.google.gwt.eclipse.sdkbundle.e42.feature"/>
             <iu id="com.google.gdt.eclipse.suite.e42.feature"/>
+            <iu id="org.eclipse.wb.core.feature"/>
+            <iu id="org.eclipse.wb.core.xml.feature"/>
+            <iu id="org.eclipse.wb.css.feature"/>
          <icon
-               image32="images/jbosstools_icon32.png">
-         </icon>
-         <overview
-               url="http://www.jboss.org/tools">
-         </overview>
-      </connectorDescriptor>
-      <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.maven"
-            groupId="org.jboss.tools.central.discovery.maven.configurators"
-            description="JBoss Maven Hibernate Configurator"
-            id="org.jboss.tools.maven.hibernate.feature"
-            kind="task"
-            license="Free, EPL"
-            name="JBoss Maven Hibernate Configurator"
-            provider="JBoss by Red Hat"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
-            <iu id="org.jboss.tools.maven.hibernate.feature"/>
-         <icon
-               image32="images/jbosstools_icon32.png">
-         </icon>
-         <overview
-               url="http://www.jboss.org/tools">
-         </overview>
-      </connectorDescriptor>
-      <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.maven"
-            groupId="org.jboss.tools.central.discovery.maven.configurators"
-            description="JBoss Maven JAX-RS Configurator"
-            id="org.jboss.tools.maven.jaxrs.feature"
-            kind="task"
-            license="Free, EPL"
-            name="JBoss Maven JAX-RS Configurator"
-            provider="JBoss by Red Hat"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
-            <iu id="org.jboss.tools.maven.jaxrs.feature"/>
-         <icon
-               image32="images/jbosstools_icon32.png">
-         </icon>
-         <overview
-               url="http://www.jboss.org/tools">
-         </overview>
-      </connectorDescriptor>
-      <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.maven"
-            groupId="org.jboss.tools.central.discovery.maven.configurators"
-            description="JBoss Maven JSF Configurator"
-            id="org.jboss.tools.maven.jsf.feature"
-            kind="task"
-            license="Free, EPL"
-            name="JBoss Maven JSF Configurator"
-            provider="JBoss by Red Hat"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
-            <iu id="org.jboss.tools.maven.jsf.feature"/>
-         <icon
-               image32="images/jbosstools_icon32.png">
-         </icon>
-         <overview
-               url="http://www.jboss.org/tools">
-         </overview>
-      </connectorDescriptor>
-      <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.maven"
-            groupId="org.jboss.tools.central.discovery.maven.configurators"
-            description="JBoss Maven Portlet Configurator"
-            id="org.jboss.tools.maven.portlet.feature"
-            kind="task"
-            license="Free, EPL"
-            name="JBoss Maven Portlet Configurator"
-            provider="JBoss by Red Hat"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
-            <iu id="org.jboss.tools.maven.portlet.feature"/>
-         <icon
-               image32="images/jbosstools_icon32.png">
-         </icon>
-         <overview
-               url="http://www.jboss.org/tools">
-         </overview>
-      </connectorDescriptor>
-      <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.maven"
-            groupId="org.jboss.tools.central.discovery.maven.configurators"
-            description="JBoss Maven Seam Configurator"
-            id="org.jboss.tools.maven.seam.feature"
-            kind="task"
-            license="Free, EPL"
-            name="JBoss Maven Seam Configurator"
-            provider="JBoss by Red Hat"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
-            <iu id="org.jboss.tools.maven.seam.feature"/>
-         <icon
-               image32="images/jbosstools_icon32.png">
+               image32="images/google_32.png">
          </icon>
          <overview
-               url="http://www.jboss.org/tools">
+               url="https://developers.google.com/web-toolkit/tools/gwtdesigner/quick_start">
          </overview>
       </connectorDescriptor>
       <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.maven"
-            groupId="org.jboss.tools.central.discovery.maven.configurators"
-            description="JBoss Maven JPA Configurator"
-            id="org.jboss.tools.maven.jpa.feature"
+            categoryId="org.jboss.tools.central.discovery.a.web"
+            groupId="org.jboss.tools.central.discovery.a.web.extras"
+            description="Google Plugin for Eclipse (GPE) + Google Web Toolkit SDK (GWT)"
+            id="com.google.gwt.eclipse.sdkbundle.e42.feature"
             kind="task"
-            license="Free, EPL"
-            name="JBoss Maven JPA Configurator"
-            provider="JBoss by Red Hat"
+            license="EPL, Other"
+            name="Google Plugin + Web Toolkit"
+            provider="Google, Inc."
             siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
-            <iu id="org.jboss.tools.maven.jpa.feature"/>
+            <iu id="com.jboss.jbds.gwt.feature"/>
+            <iu id="com.google.gwt.eclipse.sdkbundle.e42.feature"/>
+            <iu id="com.google.gdt.eclipse.suite.e42.feature"/>
          <icon
-               image32="images/jbosstools_icon32.png">
+               image32="images/google_32.png">
          </icon>
          <overview
-               url="http://www.jboss.org/tools">
+               url="https://developers.google.com/eclipse/">
          </overview>
       </connectorDescriptor>
       <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.maven"
-            groupId="org.jboss.tools.central.discovery.maven.configurators"
-            description="Maven Profile Management UI"
-            id="org.jboss.tools.maven.profiles.feature"
+            categoryId="org.jboss.tools.central.discovery.a.web"
+            groupId="org.jboss.tools.central.discovery.a.web.extras"
+            description="Tool support for the Spring Framework"
+            id="org.springframework.ide.eclipse.feature"
             kind="task"
-            license="Free, EPL"
-            name="Maven Profile Management UI"
-            provider="JBoss by Red Hat"
+            license="Free, EPL, Other"
+            name="Spring IDE"
+            provider="Spring IDE Developers"
             siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
-            <iu id="org.jboss.tools.maven.profiles.feature"/>
+            <iu id="com.jboss.jbds.springide.feature"/>
+            <iu id="org.springframework.ide.eclipse.aop.feature"/>
+            <iu id="org.springframework.ide.eclipse.autowire.feature"/>
+            <iu id="org.springframework.ide.eclipse.feature"/>
+            <iu id="org.springframework.ide.eclipse.integration.feature"/>
+            <iu id="org.springframework.ide.eclipse.osgi.feature"/>
+            <iu id="org.springframework.ide.eclipse.webflow.feature"/>
+            <iu id="org.springframework.ide.eclipse.security.feature"/>
          <icon
-               image32="images/jbosstools_icon32.png">
+               image32="images/springide_32.png">
          </icon>
          <overview
-               url="http://www.jboss.org/tools">
+               url="http://www.springsource.com/developer">
          </overview>
       </connectorDescriptor>
       
-      <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.maven"
-            groupId="org.jboss.tools.central.discovery.maven.upstream"
-            description="Maven Integration for Eclipse (m2e)"
-            id="org.eclipse.m2e.feature"
-            kind="task"
-            license="Free, EPL"
-            name="Maven Integration for Eclipse (m2e)"
-            provider="eclipse.org"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
-	    <iu id="org.eclipse.m2e.feature"/>
-         <icon
-               image32="images/m2e_32.gif">
-         </icon>
-         <overview
-               url="http://www.eclipse.org/m2e/">
-         </overview>
-      </connectorDescriptor>
-      <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.maven"
-            groupId="org.jboss.tools.central.discovery.maven.upstream"
-            description="Maven Integration for Eclipse JDT APT (m2e-apt)"
-            id="org.jboss.tools.maven.apt.feature"
-            kind="task"
-            license="Free, EPL"
-            name="Maven Integration for Eclipse JDT APT (m2e-apt)"
-            provider="JBoss by Red Hat"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
-       <iu id="org.jboss.tools.maven.apt.feature"/>
-         <icon
-               image32="images/m2e_32.gif">
-         </icon>
-         <overview
-               url="https://github.com/jbosstools/m2e-apt/">
-         </overview>
-      </connectorDescriptor>
-      <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.maven"
-            groupId="org.jboss.tools.central.discovery.maven.upstream"
-            description="Maven Integration for Web Tools (m2e-wtp)"
-            id="org.maven.ide.eclipse.wtp.feature"
-            kind="task"
-            license="Free, EPL"
-            name="Maven Integration for Web Tools (m2e-wtp)"
-            provider="eclipse.org"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
-	    <iu id="org.eclipse.m2e.wtp.feature"/>
-         <icon
-               image32="images/m2e_32.gif">
-         </icon>
-         <overview
-               url="http://www.eclipse.org/m2e-wtp/">
-         </overview>
-      </connectorDescriptor>
+      <!-- b. SCM -->
 
-       <!-- SCM -->
       <connectorCategory
             description="Plugins for source control systems"
-            id="org.jboss.tools.central.discovery.scm"
+            id="org.jboss.tools.central.discovery.b.scm"
             name="Source Control Management"
             relevance="60">
- 			<group id="org.jboss.tools.central.discovery.scm.git" /> 
- 			<group id="org.jboss.tools.central.discovery.scm.svn" />
+ 			<group id="org.jboss.tools.central.discovery.b.scm.git" /> 
+ 			<group id="org.jboss.tools.central.discovery.b.scm.svn" />
       </connectorCategory>
 
       <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.scm"
-            groupId="org.jboss.tools.central.discovery.scm.git"
-            description="Eclipse Team Provider for Git"
+            categoryId="org.jboss.tools.central.discovery.b.scm"
+            groupId="org.jboss.tools.central.discovery.b.scm.git"
+            description="Eclipse Team Provider for the Git version control system"
             id="org.eclipse.egit"
             kind="task"
             license="Free, EPL"
@@ -281,8 +165,8 @@
          </overview>
       </connectorDescriptor>
       <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.scm"
-            groupId="org.jboss.tools.central.discovery.scm.git"
+            categoryId="org.jboss.tools.central.discovery.b.scm"
+            groupId="org.jboss.tools.central.discovery.b.scm.git"
             description="Mylyn support for Eclipse EGit and GitHub"
             id="org.eclipse.egit.mylyn"
             kind="task"
@@ -299,8 +183,8 @@
          </overview>
       </connectorDescriptor>
       <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.scm"
-            groupId="org.jboss.tools.central.discovery.scm.svn"
+            categoryId="org.jboss.tools.central.discovery.b.scm"
+            groupId="org.jboss.tools.central.discovery.b.scm.svn"
             description="Eclipse Team Provider for the Subversion version control system, including SVNKit"
             id="org.tigris.subversion.subclipse"
             kind="task"
@@ -317,8 +201,8 @@
          </overview>
       </connectorDescriptor>
       <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.scm"
-            groupId="org.jboss.tools.central.discovery.scm.svn"
+            categoryId="org.jboss.tools.central.discovery.b.scm"
+            groupId="org.jboss.tools.central.discovery.b.scm.svn"
             description="Mylyn support for the Subversion version control system, including SVNKit"
             id="org.tigris.subversion.subclipse.mylyn"
             kind="task"
@@ -335,20 +219,20 @@
          </overview>
       </connectorDescriptor>
 
-       <!-- Testing -->
+       <!-- c. Testing -->
 
        <connectorCategory
             description="Plugins for testing + code quality"
-            id="org.jboss.tools.central.discovery.testing"
+            id="org.jboss.tools.central.discovery.c.testing"
             name="Testing"
             relevance="60">
-	<group id="org.jboss.tools.central.discovery.testing.local" />
- 	<group id="org.jboss.tools.central.discovery.testing.remote" />
+	<group id="org.jboss.tools.central.discovery.c.testing.local" />
+ 	<group id="org.jboss.tools.central.discovery.c.testing.remote" />
       </connectorCategory>
       
       <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.testing"
-            groupId="org.jboss.tools.central.discovery.testing.local"
+            categoryId="org.jboss.tools.central.discovery.c.testing"
+            groupId="org.jboss.tools.central.discovery.c.testing.local"
             description="Tool support for Checkstyle"
             id="net.sf.eclipsecs"
             kind="task"
@@ -365,15 +249,15 @@
          </overview>
       </connectorDescriptor>
       <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.testing"
-            groupId="org.jboss.tools.central.discovery.testing.local"
+            categoryId="org.jboss.tools.central.discovery.c.testing"
+            groupId="org.jboss.tools.central.discovery.c.testing.local"
             description="Tool support for FindBugs"
             id="edu.umd.cs.findbugs.plugin.eclipse"
             kind="task"
             license="Free, LGPL"
             name="FindBugs"
             provider="FindBugs Project"
-            siteUrl="http://download.jboss.org/jbosstools/updates/requirements/findbugs/2.0.2.20121005/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
 	    <!-- https://issues.jboss.org/browse/JBDS-2284 -->
 	    <iu id="edu.umd.cs.findbugs.plugin.eclipse"/>
          <icon
@@ -383,32 +267,10 @@
                url="http://findbugs.sourceforge.net/">
          </overview>
       </connectorDescriptor>
-      <!-- JBDS-2189 remove <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.testing"
-            groupId="org.jboss.tools.central.discovery.testing.local"
-            description="Tool support for JSLint"
-            id="com.rockstarapps.workbench.branding.feature"
-            kind="task"
-            license="Free, ASL"
-            name="JSLint"
-            provider="Rockstarapps.com"
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
-            <iu id="com.jboss.jbds.jslint.feature"/>
-            <iu id="com.rockstarapps.aws.feature"/>
-	    <iu id="com.rockstarapps.html.core.feature"/>
-	    <iu id="com.rockstarapps.jsLex"/>
-	    <iu id="com.rockstarapps.jsLint"/>
-	    <iu id="com.rockstarapps.workbench.branding.feature"/>
-         <icon
-               image32="images/jslint_32.png">
-         </icon>
-         <overview
-               url="http://www.jslint.com/">
-         </overview>
-      </connectorDescriptor> -->
+ 
       <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.testing"
-            groupId="org.jboss.tools.central.discovery.testing.local"
+            categoryId="org.jboss.tools.central.discovery.c.testing"
+            groupId="org.jboss.tools.central.discovery.c.testing.local"
             description="Mylyn support for reporting JBoss JIRAs and Red Hat Bugzillas"
             id="org.jboss.tools.common.mylyn.feature"
             kind="task"
@@ -425,15 +287,15 @@
          </overview>
       </connectorDescriptor>
       <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.testing"
-            groupId="org.jboss.tools.central.discovery.testing.local"
+            categoryId="org.jboss.tools.central.discovery.c.testing"
+            groupId="org.jboss.tools.central.discovery.c.testing.local"
             description="Tool support for PMD"
             id="net.sourceforge.pmd.eclipse"
             kind="task"
             license="Free, PMD License"
             name="PMD"
             provider="PMD Developers"
-            siteUrl="http://download.jboss.org/jbosstools/updates/requirements/pmd/3.2.6/">
+            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
 	    <!-- https://issues.jboss.org/browse/JBIDE-12562 -->
        	    <iu id="net.sourceforge.pmd.eclipse"/>
          <icon
@@ -444,8 +306,8 @@
          </overview>
       </connectorDescriptor>
 	  <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.testing"
-            groupId="org.jboss.tools.central.discovery.testing.local"
+            categoryId="org.jboss.tools.central.discovery.c.testing"
+            groupId="org.jboss.tools.central.discovery.c.testing.local"
             description="Tool support for TestNG"
             id="org.testng.eclipse"
             kind="task"
@@ -464,8 +326,8 @@
          </overview>
       </connectorDescriptor>
       <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.testing"
-            groupId="org.jboss.tools.central.discovery.testing.remote"
+            categoryId="org.jboss.tools.central.discovery.c.testing"
+            groupId="org.jboss.tools.central.discovery.c.testing.remote"
             description="Tool support for JRebel - requires JST Server"
             id="org.zeroturnaround.eclipse.feature"
             kind="task"
@@ -486,133 +348,253 @@
          </overview>
       </connectorDescriptor>
       
-      <!-- Web -->
+      <!-- d. Maven -->
 
        <connectorCategory
-            description="Plugins for web development"
-            id="org.jboss.tools.central.discovery.web"
-            name="Web Development"
+            description="Plugins for working with Maven"
+            id="org.jboss.tools.central.discovery.d.maven"
+            name="Maven"
             relevance="60">
- 			<group id="org.jboss.tools.central.discovery.web.core" /> 
- 			<group id="org.jboss.tools.central.discovery.web.extras" />
+            <!-- use groups to reorder items in a category; otherwise default to alpha order -->
+         <group id="org.jboss.tools.central.discovery.d.maven.core" /> 
+         <group id="org.jboss.tools.central.discovery.d.maven.configurators" /> 
+         <group id="org.jboss.tools.central.discovery.d.maven.upstream" />
       </connectorCategory>
 
       <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.web"
-            groupId="org.jboss.tools.central.discovery.web.core"
-            description="JST Server Core, UI, Adapters, User Doc"
-            id="org.eclipse.jst.server_core.feature"
+            categoryId="org.jboss.tools.central.discovery.d.maven"
+            groupId="org.jboss.tools.central.discovery.d.maven.core"
+            description="JBoss Maven Integration"
+            id="org.jboss.tools.maven.feature"
             kind="task"
-            license="Free, EPL, Other"
-            name="JST Server"
-            provider="Eclipse.org"
+            license="Free, EPL"
+            name="JBoss Maven Integration"
+            provider="JBoss by Red Hat"
             siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
-            <!-- <iu id="org.eclipse.jst.server_adapters.ext.feature"/> -->
-            <iu id="org.eclipse.jst.server_adapters.feature"/>
-            <iu id="org.eclipse.jst.server_core.feature"/>
-            <iu id="org.eclipse.jst.server_ui.feature"/>
-            <iu id="org.eclipse.jst.server_userdoc.feature"/>
+            <iu id="org.jboss.tools.maven.feature"/>
          <icon
-               image32="images/wtp_32.png">
+               image32="images/jbosstools_icon32.png">
          </icon>
          <overview
-               url="http://eclipse.org/webtools/">
+               url="http://www.jboss.org/tools">
          </overview>
       </connectorDescriptor>
-
       <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.web"
-            groupId="org.jboss.tools.central.discovery.web.extras"
-            description="Android Development Tools, DDMS, Hierarchy Viewer, OpenGL Tracer, Traceview"
-            id="com.android.ide.eclipse.adt"
+            categoryId="org.jboss.tools.central.discovery.d.maven"
+            groupId="org.jboss.tools.central.discovery.d.maven.configurators"
+            description="JBoss Maven CDI Configurator"
+            id="org.jboss.tools.maven.cdi.feature"
             kind="task"
-            license="EPL, Other"
-            name="Android Development Tools"
-            provider="Google, Inc."
-            siteUrl="http://download.jboss.org/jbosstools/updates/requirements/android/20.0.3.v201208082019-427395/">
-	    <!-- https://issues.jboss.org/browse/JBIDE-12498 -->
-            <iu id="com.android.ide.eclipse.adt"/>
-            <iu id="com.android.ide.eclipse.ddms"/>
-            <iu id="com.android.ide.eclipse.hierarchyviewer"/>
-            <iu id="com.android.ide.eclipse.gldebugger"/>
-            <iu id="com.android.ide.eclipse.traceview"/>
-            <!-- DO NOT INCLUDE com.android.ide.eclipse.ndk feature because it requires CDT -->
+            license="Free, EPL"
+            name="JBoss Maven CDI Configurator"
+            provider="JBoss by Red Hat"
+            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            <iu id="org.jboss.tools.maven.cdi.feature"/>
          <icon
-               image32="images/android_32.png">
+               image32="images/jbosstools_icon32.png">
          </icon>
          <overview
-               url="http://developer.android.com/tools/sdk/eclipse-adt.html">
+               url="http://www.jboss.org/tools">
          </overview>
       </connectorDescriptor>
       <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.web"
-            groupId="org.jboss.tools.central.discovery.web.extras"
-            description="Google Web Toolkit Designer + WindowBuilder"
-            id="com.google.gdt.eclipse.designer.editor.feature"
+            categoryId="org.jboss.tools.central.discovery.d.maven"
+            groupId="org.jboss.tools.central.discovery.d.maven.configurators"
+            description="JBoss Maven GWT Configurator"
+            id="org.jboss.tools.maven.gwt.feature"
             kind="task"
-            license="EPL, Other"
-            name="Google Web Toolkit Designer"
-            provider="Google, Inc."
+            license="Free, EPL"
+            name="JBoss Maven GWT Configurator"
+            provider="JBoss by Red Hat"
             siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
-            <iu id="com.jboss.jbds.gwt.designer.feature"/>
-            <iu id="com.google.gdt.eclipse.designer.editor.feature"/>
-            <iu id="com.google.gdt.eclipse.designer.gpe.feature"/>
-            <iu id="com.google.gdt.eclipse.designer.hosted.feature"/>
-            <iu id="com.google.gwt.eclipse.sdkbundle.e42.feature"/>
+            <iu id="org.jboss.tools.maven.gwt.feature"/>
             <iu id="com.google.gdt.eclipse.suite.e42.feature"/>
-            <iu id="org.eclipse.wb.core.feature"/>
-            <iu id="org.eclipse.wb.core.xml.feature"/>
-            <iu id="org.eclipse.wb.css.feature"/>
          <icon
-               image32="images/google_32.png">
+               image32="images/jbosstools_icon32.png">
          </icon>
          <overview
-               url="https://developers.google.com/web-toolkit/tools/gwtdesigner/quick_start">
+               url="http://www.jboss.org/tools">
          </overview>
       </connectorDescriptor>
       <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.web"
-            groupId="org.jboss.tools.central.discovery.web.extras"
-            description="Google Plugin for Eclipse (GPE) + Google Web Toolkit SDK (GWT)"
-            id="com.google.gwt.eclipse.sdkbundle.e42.feature"
+            categoryId="org.jboss.tools.central.discovery.d.maven"
+            groupId="org.jboss.tools.central.discovery.d.maven.configurators"
+            description="JBoss Maven Hibernate Configurator"
+            id="org.jboss.tools.maven.hibernate.feature"
             kind="task"
-            license="EPL, Other"
-            name="Google Plugin + Web Toolkit"
-            provider="Google, Inc."
+            license="Free, EPL"
+            name="JBoss Maven Hibernate Configurator"
+            provider="JBoss by Red Hat"
             siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
-            <iu id="com.jboss.jbds.gwt.feature"/>
-            <iu id="com.google.gwt.eclipse.sdkbundle.e42.feature"/>
-            <iu id="com.google.gdt.eclipse.suite.e42.feature"/>
+            <iu id="org.jboss.tools.maven.hibernate.feature"/>
          <icon
-               image32="images/google_32.png">
+               image32="images/jbosstools_icon32.png">
          </icon>
          <overview
-               url="https://developers.google.com/eclipse/">
+               url="http://www.jboss.org/tools">
          </overview>
       </connectorDescriptor>
       <connectorDescriptor
-            categoryId="org.jboss.tools.central.discovery.web"
-            groupId="org.jboss.tools.central.discovery.web.extras"
-            description="Tool support for the Spring Framework"
-            id="org.springframework.ide.eclipse.feature"
+            categoryId="org.jboss.tools.central.discovery.d.maven"
+            groupId="org.jboss.tools.central.discovery.d.maven.configurators"
+            description="JBoss Maven JAX-RS Configurator"
+            id="org.jboss.tools.maven.jaxrs.feature"
             kind="task"
-            license="Free, EPL, Other"
-            name="Spring IDE"
-            provider="Spring IDE Developers"
+            license="Free, EPL"
+            name="JBoss Maven JAX-RS Configurator"
+            provider="JBoss by Red Hat"
             siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
-	    <iu id="com.jboss.jbds.springide.feature"/>
-            <iu id="org.springframework.ide.eclipse.aop.feature"/>
-            <iu id="org.springframework.ide.eclipse.autowire.feature"/>
-            <iu id="org.springframework.ide.eclipse.feature"/>
-            <iu id="org.springframework.ide.eclipse.integration.feature"/>
-            <iu id="org.springframework.ide.eclipse.osgi.feature"/>
-            <iu id="org.springframework.ide.eclipse.webflow.feature"/>
-            <iu id="org.springframework.ide.eclipse.security.feature"/>
+            <iu id="org.jboss.tools.maven.jaxrs.feature"/>
          <icon
-               image32="images/springide_32.png">
+               image32="images/jbosstools_icon32.png">
          </icon>
          <overview
-               url="http://www.springsource.com/developer">
+               url="http://www.jboss.org/tools">
+         </overview>
+      </connectorDescriptor>
+      <connectorDescriptor
+            categoryId="org.jboss.tools.central.discovery.d.maven"
+            groupId="org.jboss.tools.central.discovery.d.maven.configurators"
+            description="JBoss Maven JSF Configurator"
+            id="org.jboss.tools.maven.jsf.feature"
+            kind="task"
+            license="Free, EPL"
+            name="JBoss Maven JSF Configurator"
+            provider="JBoss by Red Hat"
+            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            <iu id="org.jboss.tools.maven.jsf.feature"/>
+         <icon
+               image32="images/jbosstools_icon32.png">
+         </icon>
+         <overview
+               url="http://www.jboss.org/tools">
+         </overview>
+      </connectorDescriptor>
+      <connectorDescriptor
+            categoryId="org.jboss.tools.central.discovery.d.maven"
+            groupId="org.jboss.tools.central.discovery.d.maven.configurators"
+            description="JBoss Maven Portlet Configurator"
+            id="org.jboss.tools.maven.portlet.feature"
+            kind="task"
+            license="Free, EPL"
+            name="JBoss Maven Portlet Configurator"
+            provider="JBoss by Red Hat"
+            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            <iu id="org.jboss.tools.maven.portlet.feature"/>
+         <icon
+               image32="images/jbosstools_icon32.png">
+         </icon>
+         <overview
+               url="http://www.jboss.org/tools">
+         </overview>
+      </connectorDescriptor>
+      <connectorDescriptor
+            categoryId="org.jboss.tools.central.discovery.d.maven"
+            groupId="org.jboss.tools.central.discovery.d.maven.configurators"
+            description="JBoss Maven Seam Configurator"
+            id="org.jboss.tools.maven.seam.feature"
+            kind="task"
+            license="Free, EPL"
+            name="JBoss Maven Seam Configurator"
+            provider="JBoss by Red Hat"
+            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            <iu id="org.jboss.tools.maven.seam.feature"/>
+         <icon
+               image32="images/jbosstools_icon32.png">
+         </icon>
+         <overview
+               url="http://www.jboss.org/tools">
+         </overview>
+      </connectorDescriptor>
+      <connectorDescriptor
+            categoryId="org.jboss.tools.central.discovery.d.maven"
+            groupId="org.jboss.tools.central.discovery.d.maven.configurators"
+            description="JBoss Maven JPA Configurator"
+            id="org.jboss.tools.maven.jpa.feature"
+            kind="task"
+            license="Free, EPL"
+            name="JBoss Maven JPA Configurator"
+            provider="JBoss by Red Hat"
+            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            <iu id="org.jboss.tools.maven.jpa.feature"/>
+         <icon
+               image32="images/jbosstools_icon32.png">
+         </icon>
+         <overview
+               url="http://www.jboss.org/tools">
+         </overview>
+      </connectorDescriptor>
+      <connectorDescriptor
+            categoryId="org.jboss.tools.central.discovery.d.maven"
+            groupId="org.jboss.tools.central.discovery.d.maven.configurators"
+            description="Maven Profile Management UI"
+            id="org.jboss.tools.maven.profiles.feature"
+            kind="task"
+            license="Free, EPL"
+            name="Maven Profile Management UI"
+            provider="JBoss by Red Hat"
+            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            <iu id="org.jboss.tools.maven.profiles.feature"/>
+         <icon
+               image32="images/jbosstools_icon32.png">
+         </icon>
+         <overview
+               url="http://www.jboss.org/tools">
+         </overview>
+      </connectorDescriptor>
+      
+      <connectorDescriptor
+            categoryId="org.jboss.tools.central.discovery.d.maven"
+            groupId="org.jboss.tools.central.discovery.d.maven.upstream"
+            description="Maven Integration for Eclipse (m2e)"
+            id="org.eclipse.m2e.feature"
+            kind="task"
+            license="Free, EPL"
+            name="Maven Integration for Eclipse (m2e)"
+            provider="eclipse.org"
+            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            <iu id="org.eclipse.m2e.feature"/>
+         <icon
+               image32="images/m2e_32.gif">
+         </icon>
+         <overview
+               url="http://www.eclipse.org/m2e/">
+         </overview>
+      </connectorDescriptor>
+      <connectorDescriptor
+            categoryId="org.jboss.tools.central.discovery.d.maven"
+            groupId="org.jboss.tools.central.discovery.d.maven.upstream"
+            description="Maven Integration for Eclipse JDT APT (m2e-apt)"
+            id="org.jboss.tools.maven.apt.feature"
+            kind="task"
+            license="Free, EPL"
+            name="Maven Integration for Eclipse JDT APT (m2e-apt)"
+            provider="JBoss by Red Hat"
+            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            <iu id="org.jboss.tools.maven.apt.feature"/>
+         <icon
+               image32="images/m2e_32.gif">
+         </icon>
+         <overview
+               url="https://github.com/jbosstools/m2e-apt/">
+         </overview>
+      </connectorDescriptor>
+      <connectorDescriptor
+            categoryId="org.jboss.tools.central.discovery.d.maven"
+            groupId="org.jboss.tools.central.discovery.d.maven.upstream"
+            description="Maven Integration for Web Tools (m2e-wtp)"
+            id="org.maven.ide.eclipse.wtp.feature"
+            kind="task"
+            license="Free, EPL"
+            name="Maven Integration for Web Tools (m2e-wtp)"
+            provider="eclipse.org"
+            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
+            <iu id="org.eclipse.m2e.wtp.feature"/>
+         <icon
+               image32="images/m2e_32.gif">
+         </icon>
+         <overview
+               url="http://www.eclipse.org/m2e-wtp/">
          </overview>
       </connectorDescriptor>