diff --git a/pom.xml b/pom.xml
index 6c3d66382f1..a1a7bff01ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,10 +34,6 @@
 		<!-- <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/photon/milestones/</remote-site> -->
 		<swtbot-site>http://download.eclipse.org/technology/swtbot/releases/latest/</swtbot-site>
 
-		<!-- TODO remove dep on terminal and tm since in the same reactor now -->
-		<terminal-site>http://download.eclipse.org/tm/terminal/builds/development/nightly</terminal-site>
-		<tm-site>http://download.eclipse.org/tm/updates/3.7.100/repository/</tm-site>
-
 		<!-- TODO: remove dep on simrel site -->
 		<!-- <platform-release-site>http://download.eclipse.org/staging/photon/</platform-release-site> -->
 		<platform-release-site>http://download.eclipse.org/staging/2018-09/</platform-release-site>
@@ -53,12 +49,17 @@
 			<id>license-feature</id>
 			<url>${license-site}</url>
 			<layout>p2</layout>
-		</repository>	
+		</repository>
 		<repository>
 			<id>platform</id>
 			<url>${platform-site}</url>
 			<layout>p2</layout>
 		</repository>
+		<repository>
+			<id>platform-release</id>
+			<url>${platform-release-site}</url>
+			<layout>p2</layout>
+		</repository>
 		<repository>
 			<id>orbit</id>
 			<url>${orbit-site}</url>
@@ -70,8 +71,13 @@
 			<layout>p2</layout>
 		</repository>
 		<repository>
-			<id>terminal</id>
-			<url>${terminal-site}</url>
+			<id>swtbot</id>
+			<url>${swtbot-site}</url>
+			<layout>p2</layout>
+		</repository>
+		<repository>
+			<id>remote</id>
+			<url>${remote-site}</url>
 			<layout>p2</layout>
 		</repository>
 		<repository>
@@ -92,9 +98,9 @@
 				<enabled>true</enabled>
 			</releases>
 		</pluginRepository>
-		<pluginRepository>																						 
-			<id>cbi</id>																						 
-			<url>http://repo.eclipse.org/content/repositories/cbi-releases/</url>											 
+		<pluginRepository>
+			<id>cbi</id>
+			<url>http://repo.eclipse.org/content/repositories/cbi-releases/</url>
 		</pluginRepository>
 		<pluginRepository>
 			<id>cbi-snapshots</id>
@@ -343,11 +349,12 @@
 
 
 	<modules>
-    <!-- Terminal features and plug-ins -->
-    <module>terminal</module>
+		<!-- Terminal features and plug-ins -->
+		<module>terminal</module>
 		<!-- RSE features and plug-ins -->
 		<module>rse</module>
 		<!-- Windows CE subsystem and support for RSE -->
 		<module>wince</module>
+		<module>site</module>
 	</modules>
 </project>
diff --git a/rse/pom.xml b/rse/pom.xml
index 8f8810112ad..04a6a895472 100644
--- a/rse/pom.xml
+++ b/rse/pom.xml
@@ -31,6 +31,5 @@
      <module>features</module>
      <module>plugins</module>
      <module>tests</module>
-     <module>site</module>
     </modules>
 </project>
diff --git a/rse/site/category.xml b/rse/site/category.xml
deleted file mode 100644
index 940e0897e36..00000000000
--- a/rse/site/category.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature id="org.eclipse.rse">
-      <category name="rse_38_main"/>
-   </feature>
-   <feature id="org.eclipse.rse.sdk">
-      <category name="rse_38_main"/>
-   </feature>
-   <feature id="org.eclipse.rse.terminals">
-      <category name="rse_38_main"/>
-   </feature>
-   <feature id="org.eclipse.rse.useractions">
-      <category name="rse_38_main"/>
-   </feature>
-   <feature id="org.eclipse.rse.examples">
-      <category name="rse_38_optional"/>
-   </feature>
-   <feature id="org.eclipse.rse.scp">
-      <category name="rse_38_optional"/>
-   </feature>
-   
-   <category-def name="rse_38_main" label="RSE 3.8 Main Features">
-      <description>
-         RSE Main Features
-      </description>
-   </category-def>
-   <category-def name="rse_38_optional" label="RSE 3.8 Optional Add-Ons">
-      <description>
-         RSE Examples, Tests and Incubation Plug-ins.
-      </description>
-   </category-def>
-</site>
diff --git a/terminal/repos/org.eclipse.tm.terminal.repo/category.xml b/site/category.xml
similarity index 68%
rename from terminal/repos/org.eclipse.tm.terminal.repo/category.xml
rename to site/category.xml
index 6129e23e60c..a8f1a584759 100644
--- a/terminal/repos/org.eclipse.tm.terminal.repo/category.xml
+++ b/site/category.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
+   <feature id="org.eclipse.rse"><category name="rse_main"/></feature>
+   <feature id="org.eclipse.rse.sdk"><category name="rse_main"/></feature>
+   <feature id="org.eclipse.rse.terminals"><category name="rse_main"/></feature>
+   <feature id="org.eclipse.rse.useractions"><category name="rse_main"/></feature>
+
+   <feature id="org.eclipse.rse.examples"><category name="rse_optional"/></feature>
+   <feature id="org.eclipse.rse.scp"><category name="rse_optional"/></feature>
+
    <!-- Terminal Control Features -->
    <feature id="org.eclipse.tm.terminal.control.feature"><category name="terminal_main"/></feature>
    <feature id="org.eclipse.tm.terminal.control.sdk.feature"><category name="terminal_main"/></feature>
@@ -27,10 +35,28 @@
    <!-- TM Terminal "all-in-one" features -->
    <feature id="org.eclipse.tm.terminal.feature"><category name="terminal_main"/></feature>
    <feature id="org.eclipse.tm.terminal.sdk.feature"><category name="terminal_main"/></feature>
-   
-   <category-def name="terminal_main" label="TM Terminal Features">
+
+   <bundle id="org.eclipse.tm.terminal.test"><category name="terminal_optional"/></bundle>
+
+   <category-def name="terminal_main" label="Terminal Features">
       <description>
          TM Terminal Features
       </description>
    </category-def>
+   <category-def name="terminal_optional" label="Terminal Optional Add-Ons">
+      <description>
+         TM Terminal Examples, Tests, etc.
+      </description>
+   </category-def>
+
+   <category-def name="rse_main" label="RSE Features">
+      <description>
+         RSE Features
+      </description>
+   </category-def>
+   <category-def name="rse_optional" label="RSE Optional Add-Ons">
+      <description>
+         RSE Examples, Tests and Incubation Plug-ins.
+      </description>
+   </category-def>
 </site>
diff --git a/rse/site/pom.xml b/site/pom.xml
similarity index 69%
rename from rse/site/pom.xml
rename to site/pom.xml
index 29a68361213..9a82ffe9004 100755
--- a/rse/site/pom.xml
+++ b/site/pom.xml
@@ -3,12 +3,12 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.eclipse.tm.rse</groupId>
-		<artifactId>org.eclipse.tm.rse</artifactId>
-		<version>3.8.0-SNAPSHOT</version>
+		<groupId>org.eclipse.tm</groupId>
+		<artifactId>tm-parent</artifactId>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.eclipse.tm.rse</groupId>
-	<artifactId>org.eclipse.tm.rse.site</artifactId>
+	<artifactId>org.eclipse.tm.site</artifactId>
 	<packaging>eclipse-repository</packaging>
 </project>
diff --git a/terminal/admin/pom-config.xml b/terminal/admin/pom-config.xml
index 1b0a174f1be..c9887ab0a7f 100644
--- a/terminal/admin/pom-config.xml
+++ b/terminal/admin/pom-config.xml
@@ -51,74 +51,9 @@
 		<terminal-stream>development</terminal-stream>
 		<terminal-zipfile>${project.artifactId}.zip</terminal-zipfile>
 		<terminal-install>/home/data/httpd/download.eclipse.org/tm/terminal/builds/${terminal-stream}/nightly</terminal-install>
-		<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.terminal.git</tycho.scmUrl>
-
+		<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.git</tycho.scmUrl>
 	</properties>
 
-	<repositories>
-		<repository>
-			<id>license-feature</id>
-			<url>${license-site}</url>
-			<layout>p2</layout>
-		</repository>
-		<repository>
-			<id>platform</id>
-			<url>${platform-site}</url>
-			<layout>p2</layout>
-		</repository>
-		<repository>
-			<id>platform-release</id>
-			<url>${platform-release-site}</url>
-			<layout>p2</layout>
-		</repository>
-		<repository>
-			<id>orbit</id>
-			<url>${orbit-site}</url>
-			<layout>p2</layout>
-		</repository>
-		<repository>
-			<id>cdt</id>
-			<url>${cdt-site}</url>
-			<layout>p2</layout>
-		</repository>
-		<repository>
-			<id>tm</id>
-			<url>${tm-site}</url>
-			<layout>p2</layout>
-		</repository>
-		<repository>
-			<id>swtbot</id>
-			<url>${swtbot-site}</url>
-			<layout>p2</layout>
-		</repository>
-		<repository>
-			<id>remote</id>
-			<url>${remote-site}</url>
-			<layout>p2</layout>
-		</repository>
-	</repositories>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>sonatype</id>
-			<url>https://oss.sonatype.org/content/repositories/public</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-		</pluginRepository>
-		<pluginRepository>
-			<id>cbi</id>
-			<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
-		</pluginRepository>
-		<pluginRepository>
-			<id>cbi-snapshots</id>
-			<url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</url>
-		</pluginRepository>
-	</pluginRepositories>
-
 	<profiles>
 		<profile>
 			<!-- Eclipse 3.8.2 (Juno), CDT 8.4.0 (Luna SR0) -->
diff --git a/terminal/repos/org.eclipse.tm.terminal.repo/.project b/terminal/repos/org.eclipse.tm.terminal.repo/.project
deleted file mode 100644
index 37c94f97f84..00000000000
--- a/terminal/repos/org.eclipse.tm.terminal.repo/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tm.terminal.repo</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/terminal/repos/org.eclipse.tm.terminal.repo/pom.xml b/terminal/repos/org.eclipse.tm.terminal.repo/pom.xml
deleted file mode 100644
index 864b8f3625d..00000000000
--- a/terminal/repos/org.eclipse.tm.terminal.repo/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.tm.terminal</groupId>
-		<artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-		<version>4.4.0-SNAPSHOT</version>
-		<relativePath>../../admin/pom-build.xml</relativePath>
-	</parent>
-
-	<version>4.4.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.tm.terminal.repo</artifactId>
-	<packaging>eclipse-repository</packaging>
-
-	<profiles>
-		<profile>
-			<id>deploy</id>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>deploy</id>
-								<phase>install</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<target>
-										<delete includeemptydirs="true">
-											<fileset dir="${terminal-install}">
-												<include name="**" />
-											</fileset>
-										</delete>
-										<mkdir dir="${terminal-install}/common" />
-										<mkdir dir="${terminal-install}/remote" />
-										<copy includeemptydirs="false" todir="${terminal-install}">
-											<fileset dir="target/repository">
-												<include name="**" />
-											</fileset>
-											<fileset dir="target">
-												<include name="${terminal-zipfile}" />
-											</fileset>
-										</copy>
-										<chmod perm="g+w">
-											<fileset dir="${terminal-install}">
-												<include name="**" />
-											</fileset>
-										</chmod>
-									</target>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>