[EMF Viewers] Restructured update site
diff --git a/eclipse-tools/emf-graphical-viewer/releng/org.eclipse.app4mc.emf.viewers.p2repo/category.xml b/eclipse-tools/emf-graphical-viewer/releng/org.eclipse.app4mc.emf.viewers.p2repo/category.xml
index 21852c7..19328c3 100644
--- a/eclipse-tools/emf-graphical-viewer/releng/org.eclipse.app4mc.emf.viewers.p2repo/category.xml
+++ b/eclipse-tools/emf-graphical-viewer/releng/org.eclipse.app4mc.emf.viewers.p2repo/category.xml
@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
    <feature id="org.eclipse.app4mc.emf.viewers.graphical">
-      <category name="Core"/>
+      <category name="org.eclipse.app4mc.emf.viewers"/>
    </feature>
    <feature id="org.eclipse.app4mc.emf.metamodelviewers">
-      <category name="Core"/>
+      <category name="org.eclipse.app4mc.emf.viewers"/>
    </feature>
    <feature id="org.eclipse.app4mc.emf.metamodelviewers.sphinx">
-      <category name="SphinxSupport"/>
+      <category name="org.eclipse.app4mc.emf.viewers.sphinx"/>
    </feature>
-   <category-def name="APP4MC EMF Viewers" label="org.eclipse.app4mc.emf.viewers"/>
- 
-   <category-def name="SphinxSupport" label="[Optional] Sphinx Support (Requires Sphinx plugins)">
-      <category name="APP4MC EMF Viewers"/>
-   </category-def>
-   
-     <category-def name="Core" label="Core">
-      <category name="APP4MC EMF Viewers"/>
-   </category-def>
+   <category-def name="org.eclipse.app4mc.emf.viewers" label="APP4MC EMF Viewers"/>
+   <category-def name="org.eclipse.app4mc.emf.viewers.sphinx" label="APP4MC EMF Viewers - Sphinx Support [Optional]"/>
 </site>