diff --git a/docs/org.eclipse.wst.common.api.doc/pom.xml b/docs/org.eclipse.wst.common.api.doc/pom.xml
index afb2598..afa6255 100644
--- a/docs/org.eclipse.wst.common.api.doc/pom.xml
+++ b/docs/org.eclipse.wst.common.api.doc/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.docs</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/docs/org.eclipse.wst.validation.doc.isv/pom.xml b/docs/org.eclipse.wst.validation.doc.isv/pom.xml
index 9fa9790..343f6ac 100644
--- a/docs/org.eclipse.wst.validation.doc.isv/pom.xml
+++ b/docs/org.eclipse.wst.validation.doc.isv/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.docs</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/docs/org.eclipse.wst.validation.infopop/pom.xml b/docs/org.eclipse.wst.validation.infopop/pom.xml
index 87a9321..a8a3c46 100644
--- a/docs/org.eclipse.wst.validation.infopop/pom.xml
+++ b/docs/org.eclipse.wst.validation.infopop/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.docs</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/docs/pom.xml b/docs/pom.xml
new file mode 100644
index 0000000..832a57d
--- /dev/null
+++ b/docs/pom.xml
@@ -0,0 +1,19 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.webtools.common</groupId>
+		<artifactId>org.eclipse.webtools.common</artifactId>
+		<version>3.6.0-SNAPSHOT</version>
+	</parent>
+	<groupId>org.eclipse.webtools.common</groupId>
+	<artifactId>org.eclipse.webtools.common.docs</artifactId>
+	<name>org.eclipse.webtools.common.docs</name>
+	<packaging>pom</packaging>
+	<modules>
+            <module>org.eclipse.wst.common.api.doc</module>
+            <module>org.eclipse.wst.validation.doc.isv</module>
+            <module>org.eclipse.wst.validation.infopop</module>
+	</modules>
+</project>
+	
diff --git a/features/org.eclipse.jst.common.fproj.enablement.jdt.feature.patch/pom.xml b/features/org.eclipse.jst.common.fproj.enablement.jdt.feature.patch/pom.xml
index 1a47335..2f8782a 100644
--- a/features/org.eclipse.jst.common.fproj.enablement.jdt.feature.patch/pom.xml
+++ b/features/org.eclipse.jst.common.fproj.enablement.jdt.feature.patch/pom.xml
@@ -15,13 +15,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common.fproj</artifactId>
+    <artifactId>org.eclipse.webtools.common.features</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.jst.common.fproj.enablement.jdt.feature.patch</artifactId>
   <version>3.2.5-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/features/org.eclipse.jst.common.fproj.enablement.jdt.feature/pom.xml b/features/org.eclipse.jst.common.fproj.enablement.jdt.feature/pom.xml
index 4ebbabd..513be82 100644
--- a/features/org.eclipse.jst.common.fproj.enablement.jdt.feature/pom.xml
+++ b/features/org.eclipse.jst.common.fproj.enablement.jdt.feature/pom.xml
@@ -15,13 +15,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common.fproj</artifactId>
+    <artifactId>org.eclipse.webtools.common.features</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.jst.common.fproj.enablement.jdt</artifactId>
   <version>3.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/features/org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature/pom.xml b/features/org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature/pom.xml
index 6bfddbc..e1a68f7 100644
--- a/features/org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature/pom.xml
+++ b/features/org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature/pom.xml
@@ -15,13 +15,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common.fproj</artifactId>
+    <artifactId>org.eclipse.webtools.common.features</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.jst.common.fproj.enablement.jdt.sdk</artifactId>
   <version>3.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/features/org.eclipse.jst.common_core.feature.patch/pom.xml b/features/org.eclipse.jst.common_core.feature.patch/pom.xml
index b5a2044..cbbd987 100644
--- a/features/org.eclipse.jst.common_core.feature.patch/pom.xml
+++ b/features/org.eclipse.jst.common_core.feature.patch/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.features</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/features/org.eclipse.wst.common.fproj.feature.patch/pom.xml b/features/org.eclipse.wst.common.fproj.feature.patch/pom.xml
index 00e218a..345df9f 100644
--- a/features/org.eclipse.wst.common.fproj.feature.patch/pom.xml
+++ b/features/org.eclipse.wst.common.fproj.feature.patch/pom.xml
@@ -15,13 +15,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common.fproj</artifactId>
+    <artifactId>org.eclipse.webtools.common.features</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common.fproj.feature.patch</artifactId>
   <version>3.3.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/features/org.eclipse.wst.common.fproj.feature/pom.xml b/features/org.eclipse.wst.common.fproj.feature/pom.xml
index 7a465a1..d7bf004 100644
--- a/features/org.eclipse.wst.common.fproj.feature/pom.xml
+++ b/features/org.eclipse.wst.common.fproj.feature/pom.xml
@@ -15,13 +15,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common.fproj</artifactId>
+    <artifactId>org.eclipse.webtools.common.features</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common.fproj</artifactId>
   <version>3.7.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/features/org.eclipse.wst.common.fproj.sdk.feature/pom.xml b/features/org.eclipse.wst.common.fproj.sdk.feature/pom.xml
index 9d20e24..6552b87 100644
--- a/features/org.eclipse.wst.common.fproj.sdk.feature/pom.xml
+++ b/features/org.eclipse.wst.common.fproj.sdk.feature/pom.xml
@@ -15,13 +15,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common.fproj</artifactId>
+    <artifactId>org.eclipse.webtools.common.features</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common.fproj.sdk</artifactId>
   <version>3.7.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/features/org.eclipse.wst.common_core.feature/pom.xml b/features/org.eclipse.wst.common_core.feature/pom.xml
index d74e5aa..869ac70 100644
--- a/features/org.eclipse.wst.common_core.feature/pom.xml
+++ b/features/org.eclipse.wst.common_core.feature/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.features</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/features/org.eclipse.wst.common_sdk.feature/pom.xml b/features/org.eclipse.wst.common_sdk.feature/pom.xml
index 05f5fae..1fcd0c5 100644
--- a/features/org.eclipse.wst.common_sdk.feature/pom.xml
+++ b/features/org.eclipse.wst.common_sdk.feature/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.features</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/features/org.eclipse.wst.common_tests.feature/pom.xml b/features/org.eclipse.wst.common_tests.feature/pom.xml
index a1b723b..41cd89d 100644
--- a/features/org.eclipse.wst.common_tests.feature/pom.xml
+++ b/features/org.eclipse.wst.common_tests.feature/pom.xml
@@ -15,13 +15,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common.tests</artifactId>
+    <artifactId>org.eclipse.webtools.common.features</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common_tests.feature</artifactId>
   <version>3.6.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/features/org.eclipse.wst.common_ui.feature.patch/pom.xml b/features/org.eclipse.wst.common_ui.feature.patch/pom.xml
index 0a80da8..8f76e83 100644
--- a/features/org.eclipse.wst.common_ui.feature.patch/pom.xml
+++ b/features/org.eclipse.wst.common_ui.feature.patch/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.features</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/features/org.eclipse.wst.common_ui.feature/pom.xml b/features/org.eclipse.wst.common_ui.feature/pom.xml
index 2f808b3..7ef7402 100644
--- a/features/org.eclipse.wst.common_ui.feature/pom.xml
+++ b/features/org.eclipse.wst.common_ui.feature/pom.xml
@@ -14,10 +14,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.webtools.common</artifactId>
     <groupId>org.eclipse.webtools.common</groupId>
+    <artifactId>org.eclipse.webtools.common.features</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/features/pom.xml b/features/pom.xml
new file mode 100644
index 0000000..de2dae0
--- /dev/null
+++ b/features/pom.xml
@@ -0,0 +1,24 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.webtools.common</groupId>
+		<artifactId>org.eclipse.webtools.common</artifactId>
+		<version>3.6.0-SNAPSHOT</version>
+	</parent>
+	<groupId>org.eclipse.webtools.common</groupId>
+	<artifactId>org.eclipse.webtools.common.features</artifactId>
+	<name>org.eclipse.webtools.common.features</name>
+	<packaging>pom</packaging>
+	<modules>
+            <module>org.eclipse.jst.common.fproj.enablement.jdt.feature</module>
+            <module>org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature</module>
+            <module>org.eclipse.wst.common_core.feature</module>
+            <module>org.eclipse.wst.common.fproj.feature</module>
+            <module>org.eclipse.wst.common.fproj.sdk.feature</module>
+            <module>org.eclipse.wst.common_sdk.feature</module>
+            <module>org.eclipse.wst.common_tests.feature</module>
+            <module>org.eclipse.wst.common_ui.feature</module>
+	</modules>
+</project>
+	
diff --git a/plugins/org.eclipse.jem.util/pom.xml b/plugins/org.eclipse.jem.util/pom.xml
index 028dcb0..8b208f6 100644
--- a/plugins/org.eclipse.jem.util/pom.xml
+++ b/plugins/org.eclipse.jem.util/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk/pom.xml b/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk/pom.xml
index 6c2d085..3dcc44d 100644
--- a/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk/pom.xml
+++ b/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk/pom.xml
@@ -15,13 +15,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common.fproj</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.jst.common.fproj.enablement.jdt.sdk</artifactId>
   <version>1.4.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/org.eclipse.jst.common.project.facet.core/pom.xml b/plugins/org.eclipse.jst.common.project.facet.core/pom.xml
index 225947e..e752c8a 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/pom.xml
+++ b/plugins/org.eclipse.jst.common.project.facet.core/pom.xml
@@ -15,13 +15,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common.fproj</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.jst.common.project.facet.core</artifactId>
   <version>1.4.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/org.eclipse.jst.common.project.facet.ui/pom.xml b/plugins/org.eclipse.jst.common.project.facet.ui/pom.xml
index cb85379..11769e5 100644
--- a/plugins/org.eclipse.jst.common.project.facet.ui/pom.xml
+++ b/plugins/org.eclipse.jst.common.project.facet.ui/pom.xml
@@ -15,13 +15,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common.fproj</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.jst.common.project.facet.ui</artifactId>
   <version>1.4.510-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/org.eclipse.jst.common.ui/pom.xml b/plugins/org.eclipse.jst.common.ui/pom.xml
index cb8fefd..6fce986 100644
--- a/plugins/org.eclipse.jst.common.ui/pom.xml
+++ b/plugins/org.eclipse.jst.common.ui/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/plugins/org.eclipse.wst.common.core/pom.xml b/plugins/org.eclipse.wst.common.core/pom.xml
index ed6127c..9cc96be 100644
--- a/plugins/org.eclipse.wst.common.core/pom.xml
+++ b/plugins/org.eclipse.wst.common.core/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/plugins/org.eclipse.wst.common.emf/pom.xml b/plugins/org.eclipse.wst.common.emf/pom.xml
index 000f792..0b79d58 100644
--- a/plugins/org.eclipse.wst.common.emf/pom.xml
+++ b/plugins/org.eclipse.wst.common.emf/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/pom.xml b/plugins/org.eclipse.wst.common.emfworkbench.integration/pom.xml
index 99362d5..0c031a4 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/pom.xml
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/plugins/org.eclipse.wst.common.environment/pom.xml b/plugins/org.eclipse.wst.common.environment/pom.xml
index f28b699..d5ea811 100644
--- a/plugins/org.eclipse.wst.common.environment/pom.xml
+++ b/plugins/org.eclipse.wst.common.environment/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/plugins/org.eclipse.wst.common.fproj.sdk/pom.xml b/plugins/org.eclipse.wst.common.fproj.sdk/pom.xml
index fdd5437..d604686 100644
--- a/plugins/org.eclipse.wst.common.fproj.sdk/pom.xml
+++ b/plugins/org.eclipse.wst.common.fproj.sdk/pom.xml
@@ -15,13 +15,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common.fproj</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common.fproj.sdk</artifactId>
   <version>1.4.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/pom.xml b/plugins/org.eclipse.wst.common.frameworks.ui/pom.xml
index 8e1a8b6..7110c06 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/pom.xml
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/plugins/org.eclipse.wst.common.frameworks/pom.xml b/plugins/org.eclipse.wst.common.frameworks/pom.xml
index a87d1af..a734a16 100644
--- a/plugins/org.eclipse.wst.common.frameworks/pom.xml
+++ b/plugins/org.eclipse.wst.common.frameworks/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/plugins/org.eclipse.wst.common.infopop/pom.xml b/plugins/org.eclipse.wst.common.infopop/pom.xml
index 69df156..9125f97 100644
--- a/plugins/org.eclipse.wst.common.infopop/pom.xml
+++ b/plugins/org.eclipse.wst.common.infopop/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/pom.xml b/plugins/org.eclipse.wst.common.modulecore.ui/pom.xml
index c92d8a5..83c847e 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/pom.xml
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/plugins/org.eclipse.wst.common.modulecore/pom.xml b/plugins/org.eclipse.wst.common.modulecore/pom.xml
index 67704b9..3f7d257 100644
--- a/plugins/org.eclipse.wst.common.modulecore/pom.xml
+++ b/plugins/org.eclipse.wst.common.modulecore/pom.xml
@@ -15,13 +15,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common.modulecore</artifactId>
   <version>1.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/org.eclipse.wst.common.project.facet.core/pom.xml b/plugins/org.eclipse.wst.common.project.facet.core/pom.xml
index 3b9d386..e681ce0 100644
--- a/plugins/org.eclipse.wst.common.project.facet.core/pom.xml
+++ b/plugins/org.eclipse.wst.common.project.facet.core/pom.xml
@@ -15,13 +15,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common.fproj</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common.project.facet.core</artifactId>
   <version>1.4.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/org.eclipse.wst.common.project.facet.doc.api/pom.xml b/plugins/org.eclipse.wst.common.project.facet.doc.api/pom.xml
index f83b308..11a3eac 100644
--- a/plugins/org.eclipse.wst.common.project.facet.doc.api/pom.xml
+++ b/plugins/org.eclipse.wst.common.project.facet.doc.api/pom.xml
@@ -15,13 +15,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common.fproj</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common.project.facet.doc.api</artifactId>
   <version>1.4.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/org.eclipse.wst.common.project.facet.ui/pom.xml b/plugins/org.eclipse.wst.common.project.facet.ui/pom.xml
index 9a2090a..3ee31e0 100644
--- a/plugins/org.eclipse.wst.common.project.facet.ui/pom.xml
+++ b/plugins/org.eclipse.wst.common.project.facet.ui/pom.xml
@@ -15,13 +15,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common.fproj</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common.project.facet.ui</artifactId>
   <version>1.4.600-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/org.eclipse.wst.common.snippets/pom.xml b/plugins/org.eclipse.wst.common.snippets/pom.xml
index 4858690..03fe984 100644
--- a/plugins/org.eclipse.wst.common.snippets/pom.xml
+++ b/plugins/org.eclipse.wst.common.snippets/pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common.snippets</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
   </parent>
 
@@ -43,4 +43,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/org.eclipse.wst.common.ui/pom.xml b/plugins/org.eclipse.wst.common.ui/pom.xml
index 346b784..45d6571 100644
--- a/plugins/org.eclipse.wst.common.ui/pom.xml
+++ b/plugins/org.eclipse.wst.common.ui/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/plugins/org.eclipse.wst.common.uriresolver/pom.xml b/plugins/org.eclipse.wst.common.uriresolver/pom.xml
index 15d0953..e55469d 100644
--- a/plugins/org.eclipse.wst.common.uriresolver/pom.xml
+++ b/plugins/org.eclipse.wst.common.uriresolver/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/plugins/org.eclipse.wst.internet.cache/pom.xml b/plugins/org.eclipse.wst.internet.cache/pom.xml
index 927e069..f25cc31 100644
--- a/plugins/org.eclipse.wst.internet.cache/pom.xml
+++ b/plugins/org.eclipse.wst.internet.cache/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/plugins/org.eclipse.wst.validation.ui/pom.xml b/plugins/org.eclipse.wst.validation.ui/pom.xml
index 4c86e05..d84dfcd 100644
--- a/plugins/org.eclipse.wst.validation.ui/pom.xml
+++ b/plugins/org.eclipse.wst.validation.ui/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/plugins/org.eclipse.wst.validation/pom.xml b/plugins/org.eclipse.wst.validation/pom.xml
index f8b3c43..b971d28 100644
--- a/plugins/org.eclipse.wst.validation/pom.xml
+++ b/plugins/org.eclipse.wst.validation/pom.xml
@@ -15,13 +15,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.validation</artifactId>
   <version>1.2.700-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/pom.xml b/plugins/pom.xml
new file mode 100644
index 0000000..eb6a046
--- /dev/null
+++ b/plugins/pom.xml
@@ -0,0 +1,40 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.webtools.common</groupId>
+		<artifactId>org.eclipse.webtools.common</artifactId>
+		<version>3.6.0-SNAPSHOT</version>
+	</parent>
+	<groupId>org.eclipse.webtools.common</groupId>
+	<artifactId>org.eclipse.webtools.common.plugins</artifactId>
+	<name>org.eclipse.webtools.common.plugins</name>
+	<packaging>pom</packaging>
+	<modules>
+            <module>org.eclipse.jem.util</module>
+            <module>org.eclipse.jst.common.fproj.enablement.jdt.sdk</module>
+            <module>org.eclipse.jst.common.project.facet.core</module>
+            <module>org.eclipse.jst.common.project.facet.ui</module>
+            <module>org.eclipse.jst.common.ui</module>
+            <module>org.eclipse.wst.common.core</module>
+            <module>org.eclipse.wst.common.emf</module>
+            <module>org.eclipse.wst.common.emfworkbench.integration</module>
+            <module>org.eclipse.wst.common.environment</module>
+            <module>org.eclipse.wst.common.fproj.sdk</module>
+            <module>org.eclipse.wst.common.frameworks</module>
+            <module>org.eclipse.wst.common.frameworks.ui</module>
+            <module>org.eclipse.wst.common.infopop</module>
+            <module>org.eclipse.wst.common.modulecore</module>
+            <module>org.eclipse.wst.common.modulecore.ui</module>
+            <module>org.eclipse.wst.common.project.facet.core</module>
+            <module>org.eclipse.wst.common.project.facet.doc.api</module>
+            <module>org.eclipse.wst.common.project.facet.ui</module>
+            <module>org.eclipse.wst.common.snippets</module>
+            <module>org.eclipse.wst.common.ui</module>
+            <module>org.eclipse.wst.common.uriresolver</module>
+            <module>org.eclipse.wst.internet.cache</module>
+            <module>org.eclipse.wst.validation</module>
+            <module>org.eclipse.wst.validation.ui</module>
+	</modules>
+</project>
+	
diff --git a/site/category.xml b/site/category.xml
new file mode 100644
index 0000000..15e2db9
--- /dev/null
+++ b/site/category.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+    <feature id="org.eclipse.wst.common_ui.feature" version="0.0.0"><category name="common"/></feature>
+    <feature id="org.eclipse.wst.common_core.feature" version="0.0.0"><category name="common"/></feature>
+    <feature id="org.eclipse.jst.common.fproj.enablement.jdt" version="0.0.0"><category name="common"/></feature>
+    <feature id="org.eclipse.wst.common.fproj" version="0.0.0"><category name="common"/></feature>
+
+    <feature id="org.eclipse.wst.common_sdk.feature" version="0.0.0"><category name="common.sdk"/></feature>
+    <feature id="org.eclipse.wst.common.fproj.sdk" version="0.0.0"><category name="common.sdk"/></feature>
+    <feature id="org.eclipse.jst.common.fproj.enablement.jdt.sdk" version="0.0.0"><category name="common.sdk"/></feature>
+     
+    <feature id="org.eclipse.wst.common_tests.feature" version="0.0.0"><category name="common.tests"/></feature>
+
+    <category-def name="common" label="Web Tools Platform (WTP) Common"><description>
+    Common plugins shared by WTP features
+    </description></category-def>
+    <category-def name="common.sdk" label="Web Tools Platform (WTP) Common SDK"><description>
+    These features provide functionality with the executable code and the source code and are recommended for those extending or debugging WTP.
+    </description></category-def>
+    <category-def name="common.tests" label="Web Tools Platform (WTP) Common Tests"><description>
+    These features provide Unit tests for WTP. WTP Committers, or others testing WTP, will need these in at least their PDE Targets.
+    </description></category-def>
+
+</site>
diff --git a/site/pom.xml b/site/pom.xml
new file mode 100644
index 0000000..4ffb5d9
--- /dev/null
+++ b/site/pom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2017 Red Hat Inc.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    Nick Boldt (Red Hat Inc.) - initial implementation
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.webtools.common</groupId>
+    <artifactId>org.eclipse.webtools.common</artifactId>
+    <version>3.6.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.eclipse.webtools.common</groupId>
+  <artifactId>org.eclipse.webtools.common.site</artifactId>
+  <packaging>eclipse-repository</packaging>
+</project>
diff --git a/tests/org.eclipse.wst.common.project.facet.core.tests/pom.xml b/tests/org.eclipse.wst.common.project.facet.core.tests/pom.xml
index e3d4a32..0b45b7a 100644
--- a/tests/org.eclipse.wst.common.project.facet.core.tests/pom.xml
+++ b/tests/org.eclipse.wst.common.project.facet.core.tests/pom.xml
@@ -15,9 +15,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common.fproj</artifactId>
+    <artifactId>org.eclipse.webtools.common.tests</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
@@ -29,4 +28,4 @@
     <testSuite>${project.artifactId}</testSuite>
     <testClass>org.eclipse.wst.common.project.facet.core.tests.AllTests</testClass>
   </properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/tests/org.eclipse.wst.common.project.facet.ui.tests/pom.xml b/tests/org.eclipse.wst.common.project.facet.ui.tests/pom.xml
index 3ad8640..fd03ae2 100644
--- a/tests/org.eclipse.wst.common.project.facet.ui.tests/pom.xml
+++ b/tests/org.eclipse.wst.common.project.facet.ui.tests/pom.xml
@@ -15,13 +15,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common.fproj</artifactId>
+    <artifactId>org.eclipse.webtools.common.tests</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common.project.facet.ui.tests</artifactId>
   <version>1.4.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/tests/org.eclipse.wst.common.snippets.tests/pom.xml b/tests/org.eclipse.wst.common.snippets.tests/pom.xml
index a468618..baa51c4 100644
--- a/tests/org.eclipse.wst.common.snippets.tests/pom.xml
+++ b/tests/org.eclipse.wst.common.snippets.tests/pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.common</groupId>
-    <artifactId>org.eclipse.webtools.common.snippets</artifactId>
+    <artifactId>org.eclipse.webtools.common.tests</artifactId>
     <version>3.6.0-SNAPSHOT</version>
   </parent>
 
diff --git a/tests/org.eclipse.wst.common.tests.collector/pom.xml b/tests/org.eclipse.wst.common.tests.collector/pom.xml
index a5b7632..840ff2b 100644
--- a/tests/org.eclipse.wst.common.tests.collector/pom.xml
+++ b/tests/org.eclipse.wst.common.tests.collector/pom.xml
@@ -17,11 +17,10 @@
     <groupId>org.eclipse.webtools.common</groupId>
     <artifactId>org.eclipse.webtools.common.tests</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common.tests.collector</artifactId>
   <version>1.1.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/tests/org.eclipse.wst.common.tests.ui/pom.xml b/tests/org.eclipse.wst.common.tests.ui/pom.xml
index 7f2212b..9994ace 100644
--- a/tests/org.eclipse.wst.common.tests.ui/pom.xml
+++ b/tests/org.eclipse.wst.common.tests.ui/pom.xml
@@ -17,11 +17,10 @@
     <groupId>org.eclipse.webtools.common</groupId>
     <artifactId>org.eclipse.webtools.common.tests</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common.tests.ui</artifactId>
   <version>1.1.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/tests/org.eclipse.wst.common.tests.validation.guard/pom.xml b/tests/org.eclipse.wst.common.tests.validation.guard/pom.xml
index 839c28c..0fe98be 100644
--- a/tests/org.eclipse.wst.common.tests.validation.guard/pom.xml
+++ b/tests/org.eclipse.wst.common.tests.validation.guard/pom.xml
@@ -17,11 +17,10 @@
     <groupId>org.eclipse.webtools.common</groupId>
     <artifactId>org.eclipse.webtools.common.tests</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common.tests.validation.guard</artifactId>
   <version>1.0.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/tests/org.eclipse.wst.common.tests.validation/pom.xml b/tests/org.eclipse.wst.common.tests.validation/pom.xml
index 8ff1202..9111bcb 100644
--- a/tests/org.eclipse.wst.common.tests.validation/pom.xml
+++ b/tests/org.eclipse.wst.common.tests.validation/pom.xml
@@ -17,7 +17,6 @@
     <groupId>org.eclipse.webtools.common</groupId>
     <artifactId>org.eclipse.webtools.common.tests</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
@@ -30,22 +29,4 @@
     <testClass>org.eclipse.wst.validation.tests.testcase.ValidationTestSuite</testClass>
   </properties>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-surefire-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <dependencies>
-            <dependency>
-              <type>p2-installable-unit</type>
-              <groupId>org.eclipse.webtools.common</groupId>
-              <artifactId>org.eclipse.jst.common.project.facet.core</artifactId>
-            </dependency>
-          </dependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/tests/org.eclipse.wst.common.tests/pom.xml b/tests/org.eclipse.wst.common.tests/pom.xml
index b81bbaf..fde72eb 100644
--- a/tests/org.eclipse.wst.common.tests/pom.xml
+++ b/tests/org.eclipse.wst.common.tests/pom.xml
@@ -17,7 +17,6 @@
     <groupId>org.eclipse.webtools.common</groupId>
     <artifactId>org.eclipse.webtools.common.tests</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/tests/org.eclipse.wst.common.uriresolver.tests/pom.xml b/tests/org.eclipse.wst.common.uriresolver.tests/pom.xml
index e4e1cb2..446e64b 100644
--- a/tests/org.eclipse.wst.common.uriresolver.tests/pom.xml
+++ b/tests/org.eclipse.wst.common.uriresolver.tests/pom.xml
@@ -17,7 +17,6 @@
     <groupId>org.eclipse.webtools.common</groupId>
     <artifactId>org.eclipse.webtools.common.tests</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/tests/org.eclipse.wst.internet.cache.tests/pom.xml b/tests/org.eclipse.wst.internet.cache.tests/pom.xml
index ceffb73..b2e4235 100644
--- a/tests/org.eclipse.wst.internet.cache.tests/pom.xml
+++ b/tests/org.eclipse.wst.internet.cache.tests/pom.xml
@@ -17,7 +17,6 @@
     <groupId>org.eclipse.webtools.common</groupId>
     <artifactId>org.eclipse.webtools.common.tests</artifactId>
     <version>3.6.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.common</groupId>
diff --git a/tests/pom.xml b/tests/pom.xml
new file mode 100644
index 0000000..7f2cae3
--- /dev/null
+++ b/tests/pom.xml
@@ -0,0 +1,26 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.webtools.common</groupId>
+		<artifactId>org.eclipse.webtools.common</artifactId>
+		<version>3.6.0-SNAPSHOT</version>
+	</parent>
+	<groupId>org.eclipse.webtools.common</groupId>
+	<artifactId>org.eclipse.webtools.common.tests</artifactId>
+	<name>org.eclipse.webtools.common.tests</name>
+	<packaging>pom</packaging>
+	<modules>
+            <module>org.eclipse.wst.common.project.facet.core.tests</module>
+            <module>org.eclipse.wst.common.project.facet.ui.tests</module>
+            <module>org.eclipse.wst.common.snippets.tests</module>
+            <module>org.eclipse.wst.common.tests</module>
+            <module>org.eclipse.wst.common.tests.collector</module>
+            <module>org.eclipse.wst.common.tests.ui</module>
+            <module>org.eclipse.wst.common.tests.validation</module>
+            <module>org.eclipse.wst.common.tests.validation.guard</module>
+            <module>org.eclipse.wst.common.uriresolver.tests</module>
+            <module>org.eclipse.wst.internet.cache.tests</module>
+	</modules>
+</project>
+