corrections and cleanup of .projects
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/.project b/plugins/org.eclipse.jst.common.annotations.controller/.project
index 3773539..1ebb286 100644
--- a/plugins/org.eclipse.jst.common.annotations.controller/.project
+++ b/plugins/org.eclipse.jst.common.annotations.controller/.project
@@ -3,11 +3,6 @@
 	<name>org.eclipse.jst.common.annotations.controller</name>
 	<comment></comment>
 	<projects>
-		<project>com.ibm.wtp.annotations.controller</project>
-		<project>com.ibm.wtp.annotations.core</project>
-		<project>com.ibm.wtp.common</project>
-		<project>com.ibm.wtp.emf</project>
-		<project>com.ibm.wtp.emf.workbench</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/.template b/plugins/org.eclipse.jst.common.annotations.core/.template
deleted file mode 100644
index f3bcd41..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/.template
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<form>

-   <p/><p><b>Tips on working with this plug-in project</b></p><li>For the view of the new plug-in at a glance, go to the <img href="pageImage"/><a href="OverviewPage">Overview</a>.</li><li>You can test the contributions of this plug-in by launching another instance of the workbench. On the <b>Run</b> menu, click <b>Run As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.run">Run-time Workbench</a> from the available choices.</li><li>You can add more functionality to this plug-in by adding extensions using the <a href="action.newExtension">New Extension Wizard</a>.</li><li>The plug-in project contains Java code that you can debug. Place breakpoints in Java classes. On the <b>Run</b> menu, select <b>Debug As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.debug">Run-time Workbench</a> from the available choices.</li>

-</form>

diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.project b/plugins/org.eclipse.jst.common.annotations.ui/.project
index a43430d..04b8576 100644
--- a/plugins/org.eclipse.jst.common.annotations.ui/.project
+++ b/plugins/org.eclipse.jst.common.annotations.ui/.project
@@ -3,7 +3,6 @@
 	<name>org.eclipse.jst.common.annotations.ui</name>
 	<comment></comment>
 	<projects>
-		<project>com.ibm.wtp.annotations.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.template b/plugins/org.eclipse.jst.common.annotations.ui/.template
deleted file mode 100644
index f3bcd41..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.template
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<form>

-   <p/><p><b>Tips on working with this plug-in project</b></p><li>For the view of the new plug-in at a glance, go to the <img href="pageImage"/><a href="OverviewPage">Overview</a>.</li><li>You can test the contributions of this plug-in by launching another instance of the workbench. On the <b>Run</b> menu, click <b>Run As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.run">Run-time Workbench</a> from the available choices.</li><li>You can add more functionality to this plug-in by adding extensions using the <a href="action.newExtension">New Extension Wizard</a>.</li><li>The plug-in project contains Java code that you can debug. Place breakpoints in Java classes. On the <b>Run</b> menu, select <b>Debug As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.debug">Run-time Workbench</a> from the available choices.</li>

-</form>

diff --git a/plugins/org.eclipse.jst.common.frameworks/.template b/plugins/org.eclipse.jst.common.frameworks/.template
deleted file mode 100644
index f3bcd41..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/.template
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<form>

-   <p/><p><b>Tips on working with this plug-in project</b></p><li>For the view of the new plug-in at a glance, go to the <img href="pageImage"/><a href="OverviewPage">Overview</a>.</li><li>You can test the contributions of this plug-in by launching another instance of the workbench. On the <b>Run</b> menu, click <b>Run As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.run">Run-time Workbench</a> from the available choices.</li><li>You can add more functionality to this plug-in by adding extensions using the <a href="action.newExtension">New Extension Wizard</a>.</li><li>The plug-in project contains Java code that you can debug. Place breakpoints in Java classes. On the <b>Run</b> menu, select <b>Debug As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.debug">Run-time Workbench</a> from the available choices.</li>

-</form>

diff --git a/plugins/org.eclipse.jst.j2ee.core/.project b/plugins/org.eclipse.jst.j2ee.core/.project
index 3a84be4..fc4f457 100644
--- a/plugins/org.eclipse.jst.j2ee.core/.project
+++ b/plugins/org.eclipse.jst.j2ee.core/.project
@@ -3,10 +3,6 @@
 	<name>org.eclipse.jst.j2ee.core</name>
 	<comment></comment>
 	<projects>
-		<project>com.ibm.etools.validation.core</project>
-		<project>com.ibm.wtp.common</project>
-		<project>com.ibm.wtp.emf</project>
-		<project>org.eclipse.jem</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
@@ -14,8 +10,19 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/.project b/plugins/org.eclipse.jst.j2ee.jca/.project
index f98c63a..7185aae 100644
--- a/plugins/org.eclipse.jst.j2ee.jca/.project
+++ b/plugins/org.eclipse.jst.j2ee.jca/.project
@@ -10,8 +10,19 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/.project b/plugins/org.eclipse.jst.j2ee.navigator.ui/.project
index 3d095c6..8b8ec01 100644
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/.project
+++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/.project
@@ -10,8 +10,19 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/.project b/plugins/org.eclipse.jst.j2ee.ui/.project
index 1753ea9..e4b097f 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/.project
+++ b/plugins/org.eclipse.jst.j2ee.ui/.project
@@ -8,8 +8,19 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.web/.project b/plugins/org.eclipse.jst.j2ee.web/.project
index e451a31..eb96e2c 100644
--- a/plugins/org.eclipse.jst.j2ee.web/.project
+++ b/plugins/org.eclipse.jst.j2ee.web/.project
@@ -10,8 +10,19 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/.project b/plugins/org.eclipse.jst.j2ee.webservice/.project
index a890bac..5fcfb43 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/.project
+++ b/plugins/org.eclipse.jst.j2ee.webservice/.project
@@ -10,8 +10,19 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee/.project b/plugins/org.eclipse.jst.j2ee/.project
index 09a432b..8f2cf14 100644
--- a/plugins/org.eclipse.jst.j2ee/.project
+++ b/plugins/org.eclipse.jst.j2ee/.project
@@ -3,18 +3,6 @@
 	<name>org.eclipse.jst.j2ee</name>
 	<comment></comment>
 	<projects>
-		<project>com.ibm.etools.j2ee.core</project>
-		<project>com.ibm.etools.validation</project>
-		<project>com.ibm.etools.validation.mof</project>
-		<project>com.ibm.etools.wsdl</project>
-		<project>com.ibm.wtp.common</project>
-		<project>com.ibm.wtp.emf</project>
-		<project>com.ibm.wtp.emf.workbench</project>
-		<project>com.ibm.wtp.emf.workbench.edit</project>
-		<project>com.ibm.wtp.jdt.integration</project>
-		<project>com.ibm.wtp.server.core</project>
-		<project>com.ibm.wtp.server.java.core</project>
-		<project>org.eclipse.jem</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
@@ -22,8 +10,19 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>