PDE project restructuring
diff --git a/update/org.eclipse.update.core/.project b/update/org.eclipse.update.core/.project
index 4a516ed..dd666ca 100644
--- a/update/org.eclipse.update.core/.project
+++ b/update/org.eclipse.update.core/.project
@@ -15,19 +15,19 @@
 			</arguments>

 		</buildCommand>

 		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

+			<name>org.eclipse.pde.ui.ManifestBuilder</name>

 			<arguments>

 			</arguments>

 		</buildCommand>

 		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

+			<name>org.eclipse.pde.ui.SchemaBuilder</name>

 			<arguments>

 			</arguments>

 		</buildCommand>

 	</buildSpec>

 	<natures>

 		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.pde.ui.PluginNature</nature>

 		<nature>org.eclipse.team.cvs.core.cvsnature</nature>

 	</natures>

 </projectDescription>

diff --git a/update/org.eclipse.update.core/.vcm_meta b/update/org.eclipse.update.core/.vcm_meta
index 2950e46..5e6ab6d 100644
--- a/update/org.eclipse.update.core/.vcm_meta
+++ b/update/org.eclipse.update.core/.vcm_meta
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <project-description>

 	<nature id="org.eclipse.jdt.core.javanature"/>

-	<nature id="org.eclipse.pde.PluginNature"/>

+	<nature id="org.eclipse.pde.ui.PluginNature"/>

 	<reference project-name="org.apache.xerces"/>

 	<reference project-name="org.eclipse.core.boot"/>

 	<reference project-name="org.eclipse.core.runtime"/>

 	<reference project-name="org.eclipse.help"/>

 	<builder name="org.eclipse.jdt.core.javabuilder">

 	</builder>

-	<builder name="org.eclipse.pde.ManifestBuilder">

+	<builder name="org.eclipse.pde.ui.ManifestBuilder">

 	</builder>

-	<builder name="org.eclipse.pde.SchemaBuilder">

+	<builder name="org.eclipse.pde.ui.SchemaBuilder">

 	</builder>

 </project-description>

diff --git a/update/org.eclipse.update.examples/.project b/update/org.eclipse.update.examples/.project
index 006af5d..39cb54a 100644
--- a/update/org.eclipse.update.examples/.project
+++ b/update/org.eclipse.update.examples/.project
@@ -15,19 +15,19 @@
 			</arguments>

 		</buildCommand>

 		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

+			<name>org.eclipse.pde.ui.ManifestBuilder</name>

 			<arguments>

 			</arguments>

 		</buildCommand>

 		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

+			<name>org.eclipse.pde.ui.SchemaBuilder</name>

 			<arguments>

 			</arguments>

 		</buildCommand>

 	</buildSpec>

 	<natures>

 		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.pde.ui.PluginNature</nature>

 		<nature>org.eclipse.team.cvs.core.cvsnature</nature>

 	</natures>

 </projectDescription>

diff --git a/update/org.eclipse.update.examples/.vcm_meta b/update/org.eclipse.update.examples/.vcm_meta
index e7a61a3..04f1033 100644
--- a/update/org.eclipse.update.examples/.vcm_meta
+++ b/update/org.eclipse.update.examples/.vcm_meta
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <project-description>

-	<comment></comment>

 	<nature id="org.eclipse.jdt.core.javanature"/>

-	<nature id="org.eclipse.pde.PluginNature"/>

+	<nature id="org.eclipse.pde.ui.PluginNature"/>

 	<reference project-name="org.apache.xerces"/>

 	<reference project-name="org.eclipse.core.boot"/>

 	<reference project-name="org.eclipse.core.runtime"/>

 	<reference project-name="org.eclipse.update.core"/>

 	<builder name="org.eclipse.jdt.core.javabuilder">

 	</builder>

-	<builder name="org.eclipse.pde.ManifestBuilder">

+	<builder name="org.eclipse.pde.ui.ManifestBuilder">

 	</builder>

-	<builder name="org.eclipse.pde.SchemaBuilder">

+	<builder name="org.eclipse.pde.ui.SchemaBuilder">

 	</builder>

 </project-description>

diff --git a/update/org.eclipse.update.tests.core/.project b/update/org.eclipse.update.tests.core/.project
index 08fe70c..cf6e950 100644
--- a/update/org.eclipse.update.tests.core/.project
+++ b/update/org.eclipse.update.tests.core/.project
@@ -18,19 +18,19 @@
 			</arguments>

 		</buildCommand>

 		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

+			<name>org.eclipse.pde.ui.ManifestBuilder</name>

 			<arguments>

 			</arguments>

 		</buildCommand>

 		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

+			<name>org.eclipse.pde.ui.SchemaBuilder</name>

 			<arguments>

 			</arguments>

 		</buildCommand>

 	</buildSpec>

 	<natures>

 		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.pde.ui.PluginNature</nature>

 		<nature>org.eclipse.team.cvs.core.cvsnature</nature>

 	</natures>

 </projectDescription>

diff --git a/update/org.eclipse.update.tests.core/.vcm_meta b/update/org.eclipse.update.tests.core/.vcm_meta
index cf7735c..808de9f 100644
--- a/update/org.eclipse.update.tests.core/.vcm_meta
+++ b/update/org.eclipse.update.tests.core/.vcm_meta
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <project-description>

 	<nature id="org.eclipse.jdt.core.javanature"/>

-	<nature id="org.eclipse.pde.PluginNature"/>

+	<nature id="org.eclipse.pde.ui.PluginNature"/>

 	<reference project-name="org.apache.xerces"/>

 	<reference project-name="org.eclipse.core.boot"/>

 	<reference project-name="org.eclipse.core.resources"/>

@@ -11,8 +11,8 @@
 	<reference project-name="org.junit"/>

 	<builder name="org.eclipse.jdt.core.javabuilder">

 	</builder>

-	<builder name="org.eclipse.pde.ManifestBuilder">

+	<builder name="org.eclipse.pde.ui.ManifestBuilder">

 	</builder>

-	<builder name="org.eclipse.pde.SchemaBuilder">

+	<builder name="org.eclipse.pde.ui.SchemaBuilder">

 	</builder>

 </project-description>

diff --git a/update/org.eclipse.update.tests.core/test.xml b/update/org.eclipse.update.tests.core/test.xml
index 00cc97f..e6a011f 100644
--- a/update/org.eclipse.update.tests.core/test.xml
+++ b/update/org.eclipse.update.tests.core/test.xml
@@ -5,7 +5,7 @@
   <property name="eclipse-home" value="${basedir}/../.."/>

   <!-- sets the properties eclipse-home, and library-file -->

   <property name="plugin-name" value="org.eclipse.update.tests.core"/>

-  <property name="library-file" value="${eclipse-home}/fragments/org.eclipse.test/library.xml"/>

+  <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>

   <!-- This target holds all initialization code that needs to be done for -->

   <!-- all tests that are to be run. Initialization for individual tests -->

   <!-- should be done within the body of the suite target. -->

diff --git a/update/org.eclipse.update.ui/.project b/update/org.eclipse.update.ui/.project
index 1781a05..d78b5e2 100644
--- a/update/org.eclipse.update.ui/.project
+++ b/update/org.eclipse.update.ui/.project
@@ -18,19 +18,19 @@
 			</arguments>

 		</buildCommand>

 		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

+			<name>org.eclipse.pde.ui.ManifestBuilder</name>

 			<arguments>

 			</arguments>

 		</buildCommand>

 		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

+			<name>org.eclipse.pde.ui.SchemaBuilder</name>

 			<arguments>

 			</arguments>

 		</buildCommand>

 	</buildSpec>

 	<natures>

 		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.pde.ui.PluginNature</nature>

 		<nature>org.eclipse.team.cvs.core.cvsnature</nature>

 	</natures>

 </projectDescription>

diff --git a/update/org.eclipse.update.ui/.vcm_meta b/update/org.eclipse.update.ui/.vcm_meta
index 416a1a9..853ce47 100644
--- a/update/org.eclipse.update.ui/.vcm_meta
+++ b/update/org.eclipse.update.ui/.vcm_meta
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <project-description>

-	<comment></comment>

 	<nature id="org.eclipse.jdt.core.javanature"/>

-	<nature id="org.eclipse.pde.PluginNature"/>

+	<nature id="org.eclipse.pde.ui.PluginNature"/>

+	<reference project-name="org.apache.xerces"/>

 	<reference project-name="org.eclipse.core.boot"/>

 	<reference project-name="org.eclipse.core.resources"/>

 	<reference project-name="org.eclipse.core.runtime"/>

-	<reference project-name="org.eclipse.help"/>

 	<reference project-name="org.eclipse.ui"/>

 	<reference project-name="org.eclipse.update.core"/>

 	<reference project-name="org.eclipse.update.ui.forms"/>

-	<reference project-name="org.eclipse.webdav"/>

 	<builder name="org.eclipse.jdt.core.javabuilder">

 	</builder>

-	<builder name="org.eclipse.pde.ManifestBuilder">

+	<builder name="org.eclipse.pde.ui.ManifestBuilder">

 	</builder>

-	<builder name="org.eclipse.pde.SchemaBuilder">

+	<builder name="org.eclipse.pde.ui.SchemaBuilder">

 	</builder>

 </project-description>