diff --git a/features/org.eclipse.jst.server_sdk.feature/feature.xml b/features/org.eclipse.jst.server_sdk.feature/feature.xml
index 41bcda1..8c50d73 100644
--- a/features/org.eclipse.jst.server_sdk.feature/feature.xml
+++ b/features/org.eclipse.jst.server_sdk.feature/feature.xml
@@ -23,8 +23,4 @@
          id="org.eclipse.jst.server_ui.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.jst.server_ui.feature.source"
-         version="0.0.0"/>
-
 </feature>
diff --git a/features/org.eclipse.wst.server_sdk.feature/feature.xml b/features/org.eclipse.wst.server_sdk.feature/feature.xml
index 586c693..cba653e 100644
--- a/features/org.eclipse.wst.server_sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.server_sdk.feature/feature.xml
@@ -23,10 +23,6 @@
          id="org.eclipse.wst.server_ui.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.wst.server_ui.feature.source"
-         version="0.0.0"/>
-
    <plugin
          id="org.eclipse.servertools.doc.isv"
          download-size="0"
diff --git a/features/org.eclipse.wst.server_ui.feature/feature.xml b/features/org.eclipse.wst.server_ui.feature/feature.xml
index 0b20c44..04c8446 100644
--- a/features/org.eclipse.wst.server_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.server_ui.feature/feature.xml
@@ -23,9 +23,9 @@
          id="org.eclipse.wst.server_userdoc.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.wst.server_core.feature"
-         version="0.0.0"/>
+   <requires>
+      <import feature="org.eclipse.wst.server_core.feature"/>
+   </requires>
 
    <plugin
          id="org.eclipse.wst.internet.monitor.ui"
diff --git a/pom.xml b/pom.xml
index 6e6f5ce..02d7f7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,15 +55,20 @@
 
   <modules>
     <module>features/org.eclipse.jst.server_adapters.ext.feature</module>
+    <module>features/org.eclipse.jst.server_adapters.ext.sdk.feature</module>
     <module>features/org.eclipse.jst.server_adapters.feature</module>
     <module>features/org.eclipse.jst.server_adapters.sdk.feature</module>
     <module>features/org.eclipse.jst.server_core.feature</module>
     <module>features/org.eclipse.jst.server_ui.feature</module>
     <module>features/org.eclipse.jst.server_userdoc.feature</module>
+    <module>features/org.eclipse.jst.server_sdk.feature</module>
+
     <module>features/org.eclipse.wst.server_adapters.feature</module>
+    <module>features/org.eclipse.wst.server_adapters.sdk.feature</module>
     <module>features/org.eclipse.wst.server_core.feature</module>
     <module>features/org.eclipse.wst.server_ui.feature</module>
     <module>features/org.eclipse.wst.server_userdoc.feature</module>
+    <module>features/org.eclipse.wst.server_sdk.feature</module>
 
     <module>docs/org.eclipse.jst.server.ui.doc.user</module>
     <module>docs/org.eclipse.jst.server.ui.infopop</module>
@@ -118,13 +123,11 @@
         <module>tests/org.eclipse.wst.internet.monitor.ui.tests</module>
         <module>tests/org.eclipse.wst.server.ui.tests</module>
 
-        <module>features/org.eclipse.jst.server_adapters.ext_tests.feature</module>
-        <module>features/org.eclipse.jst.server_adapters.ext.sdk.feature</module>
-        <module>features/org.eclipse.jst.server_sdk.feature</module>
-        <module>features/org.eclipse.wst.server_adapters.sdk.feature</module>
-        <module>features/org.eclipse.wst.server_sdk.feature</module>
-        <module>features/org.eclipse.wst.server_tests.feature</module>
         <module>features/org.eclipse.jst.server_tests.feature</module>
+        <module>features/org.eclipse.jst.server_adapters.ext_tests.feature</module>
+        <module>features/org.eclipse.wst.server_tests.feature</module>
+
+        <module>site-integration</module>
       </modules>
 <!--       <build>
         <plugins>
diff --git a/site-integration/category.xml b/site-integration/category.xml
new file mode 100644
index 0000000..1e1988c
--- /dev/null
+++ b/site-integration/category.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+
+    <bundle id="org.eclipse.jst.server.core.tests"><category name="site-integration"/></bundle>
+    <bundle id="org.eclipse.jst.server.generic.tests"><category name="site-integration"/></bundle>
+    <bundle id="org.eclipse.jst.server.tomcat.core.tests"><category name="site-integration"/></bundle>
+    <bundle id="org.eclipse.jst.server.tomcat.ui.tests"><category name="site-integration"/></bundle>
+    <bundle id="org.eclipse.jst.server.ui.tests"><category name="site-integration"/></bundle>
+    <bundle id="org.eclipse.wst.internet.monitor.ui.tests"><category name="site-integration"/></bundle>
+    <bundle id="org.eclipse.wst.server.ui.tests"><category name="site-integration"/></bundle>
+
+    <feature id="org.eclipse.jst.server_adapters.ext_tests.feature"><category name="site-integration"/></feature>
+    <feature id="org.eclipse.wst.server_tests.feature"><category name="site-integration"/></feature>
+    <feature id="org.eclipse.jst.server_tests.feature"><category name="site-integration"/></feature>
+
+    <category-def name="site-integration" label="Web Tools (WTP) Server Tools - Integration"><description/></category-def>
+
+</site>
diff --git a/site-integration/pom.xml b/site-integration/pom.xml
new file mode 100644
index 0000000..488efe9
--- /dev/null
+++ b/site-integration/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.servertools</groupId>
+    <artifactId>org.eclipse.webtools.servertools</artifactId>
+    <version>3.6.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.eclipse.webtools.servertools</groupId>
+  <artifactId>org.eclipse.webtools.servertools.site.integration</artifactId>
+  <packaging>eclipse-repository</packaging>
+</project>
diff --git a/site/category.xml b/site/category.xml
index 8a0cd39..21a791f 100644
--- a/site/category.xml
+++ b/site/category.xml
@@ -2,15 +2,21 @@
 <site>
 
     <feature id="org.eclipse.jst.server_adapters.ext.feature"><category name="site"/></feature>
+    <feature id="org.eclipse.jst.server_adapters.ext.sdk.feature"><category name="site"/></feature>
     <feature id="org.eclipse.jst.server_adapters.feature"><category name="site"/></feature>
     <feature id="org.eclipse.jst.server_adapters.sdk.feature"><category name="site"/></feature>
     <feature id="org.eclipse.jst.server_core.feature"><category name="site"/></feature>
     <feature id="org.eclipse.jst.server_ui.feature"><category name="site"/></feature>
     <feature id="org.eclipse.jst.server_userdoc.feature"><category name="site"/></feature>
+    <feature id="org.eclipse.jst.server_sdk.feature"><category name="site"/></feature>
+
+
     <feature id="org.eclipse.wst.server_adapters.feature"><category name="site"/></feature>
+    <feature id="org.eclipse.wst.server_adapters.sdk.feature"><category name="site"/></feature>
     <feature id="org.eclipse.wst.server_core.feature"><category name="site"/></feature>
     <feature id="org.eclipse.wst.server_ui.feature"><category name="site"/></feature>
     <feature id="org.eclipse.wst.server_userdoc.feature"><category name="site"/></feature>
+    <feature id="org.eclipse.wst.server_sdk.feature"><category name="site"/></feature>
 
     <bundle id="org.eclipse.jst.server.ui.doc.user"><category name="site"/></bundle>
     <bundle id="org.eclipse.jst.server.ui.infopop"><category name="site"/></bundle>