diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/build.properties
similarity index 74%
copy from features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties
copy to features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/build.properties
index 93cea60..f249e9f 100644
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
+# 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
@@ -8,5 +8,9 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-pluginName=Web Standard Tools SDK - XML Component
-providerName=Eclipse.org
+bin.includes =\
+epl-v10.html,\
+eclipse_update_120.jpg,\
+feature.xml,\
+feature.properties,\
+license.html
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
new file mode 100644
index 0000000..17bb8e3
--- /dev/null
+++ b/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
Binary files differ
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/epl-v10.html
similarity index 99%
rename from features/org.eclipse.wst.web_sdk.feature/sourceTemplateFeature/epl-v10.html
rename to features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/epl-v10.html
index ed4b196..022ad29 100644
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplateFeature/epl-v10.html
+++ b/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/epl-v10.html
@@ -325,4 +325,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplateFeature/license.html b/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/license.html
similarity index 100%
rename from features/org.eclipse.wst.web_sdk.feature/sourceTemplateFeature/license.html
rename to features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/license.html
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.html
similarity index 99%
rename from features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.html
rename to features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.html
index dae413b..0a8aea0 100644
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.html
+++ b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.html
@@ -24,4 +24,4 @@
 src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.ini
similarity index 100%
rename from features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.ini
rename to features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.ini
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.mappings
similarity index 99%
rename from features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.mappings
rename to features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.mappings
index 720ca87..0dfb735 100644
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.mappings
+++ b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.mappings
@@ -3,4 +3,4 @@
 # java.io.Properties file (ISO 8859-1 with "\" escapes)
 # This file does not need to be translated.
 
-0=@build@
\ No newline at end of file
+0=@build@
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.properties
similarity index 100%
rename from features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.properties
rename to features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.properties
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/build.properties
similarity index 100%
rename from features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/build.properties
rename to features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/build.properties
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/eclipse32.gif
new file mode 100644
index 0000000..0282f5d
--- /dev/null
+++ b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/eclipse32.gif
Binary files differ
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/eclipse32.png
new file mode 100644
index 0000000..50ae49d
--- /dev/null
+++ b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/eclipse32.png
Binary files differ
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/plugin.properties
similarity index 91%
rename from features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties
rename to features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/plugin.properties
index 93cea60..165af04 100644
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/plugin.properties
@@ -8,5 +8,5 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-pluginName=Web Standard Tools SDK - XML Component
+pluginName=Web Standard Tools SDK - Common Component
 providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.web_sdk.feature/build.properties b/features/org.eclipse.wst.web_sdk.feature/build.properties
index 607263b..9c23cce 100644
--- a/features/org.eclipse.wst.web_sdk.feature/build.properties
+++ b/features/org.eclipse.wst.web_sdk.feature/build.properties
@@ -3,9 +3,5 @@
                epl-v10.html,\
                license.html
 
-generate.feature@org.eclipse.wst.web_sdk.feature.source=org.eclipse.wst.web_sdk.feature
-src.includes = license.html,\
-               feature.xml,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               build.properties
+generate.feature@org.eclipse.wst.web_ui.feature.source=org.eclipse.wst.web_ui.feature
+
diff --git a/features/org.eclipse.wst.web_sdk.feature/feature.xml b/features/org.eclipse.wst.web_sdk.feature/feature.xml
index 26d1733..e7faf67 100644
--- a/features/org.eclipse.wst.web_sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.web_sdk.feature/feature.xml
@@ -17,7 +17,7 @@
    </license>
 
    <includes
-         id="org.eclipse.wst.web_sdk.feature.source"
+         id="org.eclipse.wst.web_ui.feature.source"
          version="0.0.0"/>
 
    <includes
@@ -38,66 +38,6 @@
       <import feature="org.eclipse.wst.server_sdk.feature" version="1.0.0"/>
       <import feature="org.eclipse.wst.web_ui.feature" version="1.0.0"/>
    </requires>
-   <plugin
-         id="org.eclipse.wst.css.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
-   <plugin
-         id="org.eclipse.wst.html.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.javascript.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.web"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.html.standard.dtds"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-   <plugin
-         id="org.eclipse.wst.css.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.html.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.javascript.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.web.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
 </feature>
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.wst.web_sdk.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/eclipse32.gif
deleted file mode 100644
index e6ad7cc..0000000
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 568fac1..0000000
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/build.properties
similarity index 65%
copy from features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties
copy to features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/build.properties
index 93cea60..dd8a618 100644
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
+# 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
@@ -8,5 +8,12 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-pluginName=Web Standard Tools SDK - XML Component
-providerName=Eclipse.org
+bin.includes =\
+epl-v10.html,\
+eclipse_update_120.jpg,\
+feature.xml,\
+feature.properties,\
+license.html
+
+generate.feature@org.eclipse.wst.web_core.feature.source = org.eclipse.wst.web_core.feature
+
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
new file mode 100644
index 0000000..17bb8e3
--- /dev/null
+++ b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
Binary files differ
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/epl-v10.html
similarity index 99%
copy from features/org.eclipse.wst.web_sdk.feature/sourceTemplateFeature/epl-v10.html
copy to features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/epl-v10.html
index ed4b196..022ad29 100644
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplateFeature/epl-v10.html
+++ b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/epl-v10.html
@@ -325,4 +325,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/feature.properties
similarity index 100%
rename from features/org.eclipse.wst.web_sdk.feature/sourceTemplateFeature/feature.properties
rename to features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/feature.properties
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/feature.xml
new file mode 100644
index 0000000..075b546
--- /dev/null
+++ b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/feature.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+	primary="false"
+	label="org.eclipse.wst.web_ui.feature.source"
+	id="org.eclipse.wst.web_ui.feature.source"
+	version="1.0.0">
+	<description url="http://www.example.com/description">
+		%description
+	</description>
+	<copyright url="http://www.example.com/copyright">
+		%copyright
+	</copyright>
+	<license url="http://www.example.com/license">%license</license>
+	
+	<includes
+         id="org.eclipse.wst.web_core.feature.source"
+         version="0.0.0"/>
+    <plugin
+         id="org.eclipse.wst.web_ui.feature.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>   
+                          
+</feature>
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplateFeature/license.html b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/license.html
similarity index 100%
copy from features/org.eclipse.wst.web_sdk.feature/sourceTemplateFeature/license.html
copy to features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/license.html
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.html
similarity index 99%
copy from features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.html
copy to features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.html
index dae413b..0a8aea0 100644
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.html
+++ b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.html
@@ -24,4 +24,4 @@
 src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.ini
similarity index 100%
copy from features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.ini
copy to features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.ini
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.mappings
similarity index 99%
copy from features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.mappings
copy to features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.mappings
index 720ca87..0dfb735 100644
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.mappings
+++ b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.mappings
@@ -3,4 +3,4 @@
 # java.io.Properties file (ISO 8859-1 with "\" escapes)
 # This file does not need to be translated.
 
-0=@build@
\ No newline at end of file
+0=@build@
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.properties
similarity index 100%
copy from features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.properties
copy to features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.properties
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/build.properties
new file mode 100644
index 0000000..5895597
--- /dev/null
+++ b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/build.properties
@@ -0,0 +1,3 @@
+
+bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/
+sourcePlugin = true
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/eclipse32.gif
new file mode 100644
index 0000000..0282f5d
--- /dev/null
+++ b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/eclipse32.gif
Binary files differ
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/eclipse32.png
new file mode 100644
index 0000000..50ae49d
--- /dev/null
+++ b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/eclipse32.png
Binary files differ
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/plugin.properties
similarity index 90%
copy from features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties
copy to features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/plugin.properties
index 93cea60..be01280 100644
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/plugin.properties
@@ -8,5 +8,5 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-pluginName=Web Standard Tools SDK - XML Component
+pluginName=Web Standard Tools SDK - WST Web Component
 providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/build.properties
similarity index 74%
copy from features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties
copy to features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/build.properties
index 93cea60..f249e9f 100644
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
+# 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
@@ -8,5 +8,9 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-pluginName=Web Standard Tools SDK - XML Component
-providerName=Eclipse.org
+bin.includes =\
+epl-v10.html,\
+eclipse_update_120.jpg,\
+feature.xml,\
+feature.properties,\
+license.html
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
new file mode 100644
index 0000000..17bb8e3
--- /dev/null
+++ b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
Binary files differ
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/epl-v10.html
similarity index 99%
copy from features/org.eclipse.wst.web_sdk.feature/sourceTemplateFeature/epl-v10.html
copy to features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/epl-v10.html
index ed4b196..022ad29 100644
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplateFeature/epl-v10.html
+++ b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/epl-v10.html
@@ -325,4 +325,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplateFeature/license.html b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/license.html
similarity index 100%
rename from features/org.eclipse.wst.xml_sdk.feature/sourceTemplateFeature/license.html
rename to features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/license.html
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.html
similarity index 99%
copy from features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.html
copy to features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.html
index dae413b..0a8aea0 100644
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.html
+++ b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.html
@@ -24,4 +24,4 @@
 src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.ini
similarity index 100%
rename from features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/about.ini
rename to features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.ini
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.mappings
similarity index 99%
copy from features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.mappings
copy to features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.mappings
index 720ca87..0dfb735 100644
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.mappings
+++ b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.mappings
@@ -3,4 +3,4 @@
 # java.io.Properties file (ISO 8859-1 with "\" escapes)
 # This file does not need to be translated.
 
-0=@build@
\ No newline at end of file
+0=@build@
diff --git a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.properties
similarity index 100%
rename from features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/about.properties
rename to features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.properties
diff --git a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/build.properties
similarity index 100%
rename from features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/build.properties
rename to features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/build.properties
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/eclipse32.gif
new file mode 100644
index 0000000..0282f5d
--- /dev/null
+++ b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/eclipse32.gif
Binary files differ
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/eclipse32.png
new file mode 100644
index 0000000..50ae49d
--- /dev/null
+++ b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/eclipse32.png
Binary files differ
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/plugin.properties
similarity index 91%
copy from features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties
copy to features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/plugin.properties
index 93cea60..165af04 100644
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/plugin.properties
@@ -8,5 +8,5 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-pluginName=Web Standard Tools SDK - XML Component
+pluginName=Web Standard Tools SDK - Common Component
 providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.xml_sdk.feature/build.properties b/features/org.eclipse.wst.xml_sdk.feature/build.properties
index 033ad60..f238b71 100644
--- a/features/org.eclipse.wst.xml_sdk.feature/build.properties
+++ b/features/org.eclipse.wst.xml_sdk.feature/build.properties
@@ -3,9 +3,4 @@
                epl-v10.html,\
                eclipse_update_120.jpg
 
-generate.feature@org.eclipse.wst.xml_sdk.feature.source=org.eclipse.wst.xml_sdk.feature
-src.includes = build.properties,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               feature.xml,\
-               license.html
+generate.feature@org.eclipse.wst.xml_ui.feature.source=org.eclipse.wst.xml_ui.feature
diff --git a/features/org.eclipse.wst.xml_sdk.feature/feature.xml b/features/org.eclipse.wst.xml_sdk.feature/feature.xml
index 231a6dd..246ac04 100644
--- a/features/org.eclipse.wst.xml_sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_sdk.feature/feature.xml
@@ -21,7 +21,7 @@
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.wst.xml_sdk.feature.source"
+         id="org.eclipse.wst.xml_ui.feature.source"
          version="0.0.0"/>
 
    <requires>
@@ -29,60 +29,5 @@
       <import feature="org.eclipse.wst.xml_ui.feature" version="1.0.0"/>
    </requires>
 
-   <plugin
-         id="org.eclipse.wst.dtd.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.dtd.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.sse.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.sse.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xsd.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xsd.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
 </feature>
diff --git a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.wst.xml_sdk.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.wst.xml_sdk.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index dae413b..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content 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 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>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 720ca87..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file
diff --git a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/eclipse32.gif
deleted file mode 100644
index e6ad7cc..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 568fac1..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 93cea60..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-pluginName=Web Standard Tools SDK - XML Component
-providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/build.properties
similarity index 65%
copy from features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties
copy to features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/build.properties
index 93cea60..19b7468 100644
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
+# 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
@@ -8,5 +8,12 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-pluginName=Web Standard Tools SDK - XML Component
-providerName=Eclipse.org
+bin.includes =\
+epl-v10.html,\
+eclipse_update_120.jpg,\
+feature.xml,\
+feature.properties,\
+license.html
+
+generate.feature@org.eclipse.wst.xml_core.feature.source = org.eclipse.wst.xml_core.feature
+
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
new file mode 100644
index 0000000..17bb8e3
--- /dev/null
+++ b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
Binary files differ
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/epl-v10.html
similarity index 99%
copy from features/org.eclipse.wst.web_sdk.feature/sourceTemplateFeature/epl-v10.html
copy to features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/epl-v10.html
index ed4b196..022ad29 100644
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplateFeature/epl-v10.html
+++ b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/epl-v10.html
@@ -325,4 +325,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.properties
similarity index 100%
rename from features/org.eclipse.wst.xml_sdk.feature/sourceTemplateFeature/feature.properties
rename to features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.properties
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.xml
new file mode 100644
index 0000000..503d502
--- /dev/null
+++ b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+	primary="false"
+	label="org.eclipse.wst.xml_ui.feature.source"
+	id="org.eclipse.wst.xml_ui.feature.source"
+	version="1.0.0">
+	<description url="http://www.example.com/description">
+		%description
+	</description>
+	<copyright url="http://www.example.com/copyright">
+		%copyright
+	</copyright>
+	<license url="http://www.example.com/license">%license</license>
+	
+	<includes
+         id="org.eclipse.wst.xml_core.feature.source"
+         version="0.0.0"/>
+    <plugin
+         id="org.eclipse.wst.xml_ui.feature.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>   
+                          
+</feature>
diff --git a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplateFeature/license.html b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/license.html
similarity index 100%
copy from features/org.eclipse.wst.xml_sdk.feature/sourceTemplateFeature/license.html
copy to features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/license.html
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.html
similarity index 99%
copy from features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.html
copy to features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.html
index dae413b..0a8aea0 100644
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.html
+++ b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.html
@@ -24,4 +24,4 @@
 src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.ini
similarity index 100%
copy from features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/about.ini
copy to features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.ini
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.mappings
similarity index 99%
copy from features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.mappings
copy to features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.mappings
index 720ca87..0dfb735 100644
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/about.mappings
+++ b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.mappings
@@ -3,4 +3,4 @@
 # java.io.Properties file (ISO 8859-1 with "\" escapes)
 # This file does not need to be translated.
 
-0=@build@
\ No newline at end of file
+0=@build@
diff --git a/features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.properties
similarity index 100%
copy from features/org.eclipse.wst.xml_sdk.feature/sourceTemplatePlugin/about.properties
copy to features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.properties
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/build.properties
new file mode 100644
index 0000000..5895597
--- /dev/null
+++ b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/build.properties
@@ -0,0 +1,3 @@
+
+bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/
+sourcePlugin = true
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/eclipse32.gif
new file mode 100644
index 0000000..0282f5d
--- /dev/null
+++ b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/eclipse32.gif
Binary files differ
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/eclipse32.png
new file mode 100644
index 0000000..50ae49d
--- /dev/null
+++ b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/eclipse32.png
Binary files differ
diff --git a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/plugin.properties
similarity index 90%
copy from features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties
copy to features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/plugin.properties
index 93cea60..0e83dbb 100644
--- a/features/org.eclipse.wst.web_sdk.feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/plugin.properties
@@ -8,5 +8,5 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-pluginName=Web Standard Tools SDK - XML Component
+pluginName=Web Standard Tools SDK - WST XML Component
 providerName=Eclipse.org