diff --git a/org.eclipse.wtp.releng.webupdatesite/.classpath b/org.eclipse.wtp.releng.webupdatesite/.classpath
index 64c5e31..2fbb7a2 100644
--- a/org.eclipse.wtp.releng.webupdatesite/.classpath
+++ b/org.eclipse.wtp.releng.webupdatesite/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.wtp.releng.webupdatesite/META-INF/MANIFEST.MF b/org.eclipse.wtp.releng.webupdatesite/META-INF/MANIFEST.MF
index ec33a4a..6ddf07a 100644
--- a/org.eclipse.wtp.releng.webupdatesite/META-INF/MANIFEST.MF
+++ b/org.eclipse.wtp.releng.webupdatesite/META-INF/MANIFEST.MF
@@ -6,5 +6,5 @@
 Export-Package: org.eclipse.callisto.tools,
  org.eclipse.callisto.tools.utils,
  org.eclipse.wtp.releng.tools
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Bundle-Localization: plugin
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/build-featureFileCreate-Jar.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/build-featureFileCreate-Jar.xml
deleted file mode 100644
index bdec36b..0000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/build-featureFileCreate-Jar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="create_run_jar" name="Create Runnable Jar for Project org.eclipse.wtp.releng.webupdatesite">
-    <!--this file was created by Eclipse Runnable JAR Export Wizard-->
-    <!--ANT 1.7 is required                                        -->
-    <target name="create_run_jar">
-        <jar destfile="D:/builds/Workspaces/wtpPureHead/org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar" filesetmanifest="mergewithoutmain">
-            <manifest>
-                <attribute name="Built-By" value="${user.name}"/>
-                <attribute name="Main-Class" value="org.eclipse.wtp.releng.tools.CreateFeatureUpdateFile"/>
-                <attribute name="Class-Path" value="."/>
-            </manifest>
-            <fileset dir="D:/builds/Workspaces/wtpPureHead/org.eclipse.wtp.releng.webupdatesite/bin"/>
-        </jar>
-    </target>
-</project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar b/org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar
index 068fb7d..14f42cb 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar
Binary files differ
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/siteFileUpdater.jar b/org.eclipse.wtp.releng.webupdatesite/build-home/siteFileUpdater.jar
index bc972b0..c5426cb 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/siteFileUpdater.jar
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/siteFileUpdater.jar
Binary files differ
diff --git a/org.eclipse.wtp.releng.webupdatesite/featureFileUpdaterDescription.jardesc b/org.eclipse.wtp.releng.webupdatesite/featureFileUpdaterDescription.jardesc
index 95af882..47d3907 100644
--- a/org.eclipse.wtp.releng.webupdatesite/featureFileUpdaterDescription.jardesc
+++ b/org.eclipse.wtp.releng.webupdatesite/featureFileUpdaterDescription.jardesc
@@ -14,40 +14,39 @@
         <file path="/org.eclipse.wtp.releng.webupdatesite/.cvsignore"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-galileo-wtp.xml"/>
         <javaElement handleIdentifier="=org.eclipse.wtp.releng.webupdatesite/src"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateCallistoMirrorAll.xml"/>
         <folder path="/org.eclipse.wtp.releng.webupdatesite/WebContent"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateFinalSite.sh"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-code.sh"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateCallistoMirrorAll.xml"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createPack200s.xml"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-code.sh"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateFinalSite.sh"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-ganymede-patches.xml"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jem.xml"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/instructions.txt"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/webtools.build"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-wtp.xml"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/instructions.txt"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-wtp.xml"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource"/>
         <folder path="/org.eclipse.wtp.releng.webupdatesite/META-INF"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMileStone.sh"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-SiteFiles.sh"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateEuropaMirrorAll.xml"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateGanymedeMirrorAll.xml"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/wtp.sc"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/.project"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateGalileoMirrorAll.xml"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/build-featureFileCreate-Jar.xml"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/.project"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-code.sh"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/removeOutOfSynch.sh"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateTestUpdateSite.sh"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/features-galileo-wtp.xml"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/plugin.properties"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/features-galileo-wtp.xml"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createP2Repo.xml"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateGanymedeMirrorPatches.xml"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/.classpath"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-siteFiles.sh"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jpa.xml"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-siteFiles.sh"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/wtp.sc"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createMirrorSite.xml"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/properties.shsource"/>
diff --git a/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc b/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc
index 45601bd..248ad98 100644
--- a/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc
+++ b/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc
@@ -10,23 +10,23 @@
         </sealing>
     </manifest>
     <selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false">
-        <file path="/org.eclipse.wtp.releng.webupdatesite/.cvsignore"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-galileo-wtp.xml"/>
         <javaElement handleIdentifier="=org.eclipse.wtp.releng.webupdatesite/src"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateFinalSite.sh"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateCallistoMirrorAll.xml"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/.cvsignore"/>
         <folder path="/org.eclipse.wtp.releng.webupdatesite/WebContent"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createPack200s.xml"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateFinalSite.sh"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-code.sh"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createPack200s.xml"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateCallistoMirrorAll.xml"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-ganymede-patches.xml"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/instructions.txt"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/webtools.build"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jem.xml"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-wtp.xml"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/webtools.build"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/instructions.txt"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-wtp.xml"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource"/>
         <folder path="/org.eclipse.wtp.releng.webupdatesite/META-INF"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMileStone.sh"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-SiteFiles.sh"/>
@@ -35,19 +35,18 @@
         <file path="/org.eclipse.wtp.releng.webupdatesite/wtp.sc"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/.project"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateGalileoMirrorAll.xml"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/build-featureFileCreate-Jar.xml"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-code.sh"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/removeOutOfSynch.sh"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateTestUpdateSite.sh"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/features-galileo-wtp.xml"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/plugin.properties"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/features-galileo-wtp.xml"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createP2Repo.xml"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateGanymedeMirrorPatches.xml"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/.classpath"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-siteFiles.sh"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jpa.xml"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-siteFiles.sh"/>
         <folder path="/org.eclipse.wtp.releng.webupdatesite/.settings"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/wtp.sc"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createMirrorSite.xml"/>
@@ -59,8 +58,8 @@
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createDigests.xml"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/ant.sh"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jsf.xml"/>
-        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-ganymede-wtp.xml"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build.properties"/>
+        <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-ganymede-wtp.xml"/>
         <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-europa-wtp.xml"/>
     </selectedElements>
     <fatjar builder="org.eclipse.jdt.ui.plain_jar_builder" launchConfig=""/>
diff --git a/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/webtools.build.xml b/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/webtools.build.xml
index bdaf7a2..fe5c3b8 100644
--- a/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/webtools.build.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/webtools.build.xml
@@ -57,7 +57,7 @@
             href="galileo.build#//@categories.2"/>
     </features>
     <features
-        id="org.eclipse.wst.xml.feature"
+        id="org.eclipse.wst.xml_ui.feature"
         version="1.0.2.v200809102023-6-7SBcMAAwAyIPHRNV"
         repo="//@repositories.0">
         <category