prep for new features
diff --git a/assembly/features/org.eclipse.wst.sdk/feature.xml b/assembly/features/org.eclipse.wst.sdk/feature.xml
index dd72d89..8b80aca 100644
--- a/assembly/features/org.eclipse.wst.sdk/feature.xml
+++ b/assembly/features/org.eclipse.wst.sdk/feature.xml
@@ -26,6 +26,27 @@
          id="org.eclipse.wst.server_sdk.feature"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.wst.common_sdk.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.wst.rdb_sdk.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.wst.xml_sdk.feature"
+         version="0.0.0"/>
+
+   <requires>
+      <import feature="org.eclipse.wst.common_sdk.feature" version="1.0.0"/>
+      <import feature="org.eclipse.wst.rdb_sdk.feature" version="1.0.0"/>
+      <import feature="org.eclipse.wst.server_sdk.feature" version="1.0.0"/>
+      <import feature="org.eclipse.wst.web_sdk.feature" version="1.0.0"/>
+      <import feature="org.eclipse.wst.ws_sdk.feature" version="1.0.0"/>
+      <import feature="org.eclipse.wst.xml_sdk.feature" version="1.0.0"/>
+   </requires>
+
    <plugin
          id="org.eclipse.wst"
          download-size="0"
diff --git a/features/org.eclipse.wst.doc.user.feature/feature.xml b/features/org.eclipse.wst.doc.user.feature/feature.xml
index 6e588ee..2336bdc 100644
--- a/features/org.eclipse.wst.doc.user.feature/feature.xml
+++ b/features/org.eclipse.wst.doc.user.feature/feature.xml
@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
 <feature
       id="org.eclipse.wst.doc.user.feature"
       label="Web Standard Tools Doc Feature"
@@ -23,164 +13,37 @@
       %license
    </license>
 
+   <includes
+         id="org.eclipse.wst.common_userdoc.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.wst.rdb_userdoc.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.wst.server_userdoc.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.wst.web_userdoc.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.wst.ws_userdoc.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.wst.xml_userdoc.feature"
+         version="0.0.0"/>
+
    <requires>
-      <import plugin="org.eclipse.help"/>
+      <import feature="org.eclipse.wst.common_userdoc.feature" version="1.0.0"/>
+      <import feature="org.eclipse.wst.rdb_userdoc.feature" version="1.0.0"/>
+      <import feature="org.eclipse.wst.server_userdoc.feature" version="1.0.0"/>
+      <import feature="org.eclipse.wst.web_userdoc.feature" version="1.0.0"/>
+      <import feature="org.eclipse.wst.ws_userdoc.feature" version="1.0.0"/>
+      <import feature="org.eclipse.wst.xml_userdoc.feature" version="1.0.0"/>
    </requires>
 
-   <plugin
-         id="org.eclipse.wst.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.common.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.dtd.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.dtdeditor.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.html.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.javascript.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.rdb.connection.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.rdb.fe.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.rdb.outputview.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.rdb.server.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.rdb.sqleditor.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-  <plugin
-         id="org.eclipse.wst.sqleditor.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-         
-   <plugin
-         id="org.eclipse.wst.server.ui.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.server.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.sse.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.sse.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.webtools.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.ws.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xmleditor.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xsdeditor.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.wsdl.ui.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-  <plugin
-         id="org.eclipse.wst.wsi.ui.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.datatools.connection.ui.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-         
-         <plugin
-         id="org.eclipse.wst.datatools.fe.ui.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-         
-         <plugin
-         id="org.eclipse.wst.datatools.server.ui.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
 </feature>