diff --git a/releng/org.eclipse.cdt.repo/category.xml b/releng/org.eclipse.cdt.repo/category.xml
index c2121249f62..ee9068715b3 100644
--- a/releng/org.eclipse.cdt.repo/category.xml
+++ b/releng/org.eclipse.cdt.repo/category.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <category-def name="main" label="CDT Main Features"/>
-   <category-def name="extra" label="CDT Optional Features"/>
-   <category-def name="launchbar" label="LaunchBar"/>
    <feature url="features/org.eclipse.cdt_0.0.0.qualifier.jar" id="org.eclipse.cdt" version="0.0.0">
       <category name="main"/>
    </feature>
@@ -123,7 +120,7 @@
    <feature url="features/org.eclipse.cdt.qt_0.0.0.qualifier.jar" id="org.eclipse.cdt.qt" version="0.0.0">
       <category name="extra"/>
    </feature>
-     <feature url="features/org.eclipse.cdt.qt.source_0.0.0.qualifier.jar" id="org.eclipse.cdt.qt.source" version="0.0.0">
+   <feature url="features/org.eclipse.cdt.qt.source_0.0.0.qualifier.jar" id="org.eclipse.cdt.qt.source" version="0.0.0">
       <category name="extra"/>
    </feature>
    <feature url="features/org.eclipse.cdt.debug.dap_0.0.0.qualifier.jar" id="org.eclipse.cdt.debug.dap" version="0.0.0">
@@ -202,4 +199,66 @@
    <iu id="org.eclipse.tools.templates.freemarker.source" version="0.0.0"/>
    <iu id="org.eclipse.tools.templates.ui" version="0.0.0"/>
    <iu id="org.eclipse.tools.templates.ui.source" version="0.0.0"/>
+   <feature id="org.eclipse.tm.terminal.control.feature">
+      <category name="terminal_main"/>
+   </feature>
+   <feature id="org.eclipse.tm.terminal.control.feature.source">
+      <category name="terminal_sdk"/>
+   </feature>
+   <feature id="org.eclipse.tm.terminal.connector.local.feature">
+      <category name="terminal_main"/>
+   </feature>
+   <feature id="org.eclipse.tm.terminal.connector.local.feature.source">
+      <category name="terminal_sdk"/>
+   </feature>
+   <feature id="org.eclipse.tm.terminal.connector.cdtserial.feature">
+      <category name="terminal_main"/>
+   </feature>
+   <feature id="org.eclipse.tm.terminal.connector.cdtserial.feature.source">
+      <category name="terminal_sdk"/>
+   </feature>
+   <feature id="org.eclipse.tm.terminal.connector.ssh.feature">
+      <category name="terminal_main"/>
+   </feature>
+   <feature id="org.eclipse.tm.terminal.connector.ssh.feature.source">
+      <category name="terminal_sdk"/>
+   </feature>
+   <feature id="org.eclipse.tm.terminal.connector.telnet.feature">
+      <category name="terminal_main"/>
+   </feature>
+   <feature id="org.eclipse.tm.terminal.connector.telnet.feature.source">
+      <category name="terminal_sdk"/>
+   </feature>
+   <feature id="org.eclipse.tm.terminal.connector.remote.feature">
+      <category name="terminal_main"/>
+   </feature>
+   <feature id="org.eclipse.tm.terminal.connector.remote.feature.source">
+      <category name="terminal_sdk"/>
+   </feature>
+   <feature id="org.eclipse.tm.terminal.view.feature">
+      <category name="terminal_main"/>
+   </feature>
+   <feature id="org.eclipse.tm.terminal.view.feature.source">
+      <category name="terminal_sdk"/>
+   </feature>
+   <feature id="org.eclipse.tm.terminal.feature">
+      <category name="terminal_main"/>
+   </feature>
+   <feature id="org.eclipse.tm.terminal.feature.source">
+      <category name="terminal_sdk"/>
+   </feature>
+   <category-def name="main" label="CDT Main Features"/>
+   <category-def name="extra" label="CDT Optional Features"/>
+   <category-def name="launchbar" label="LaunchBar"/>
+   <category-def name="launchbar" label="LaunchBar"/>
+   <category-def name="terminal_main" label="Terminal Features">
+      <description>
+         TM Terminal Features
+      </description>
+   </category-def>
+   <category-def name="terminal_sdk" label="Terminal SDK Features">
+      <description>
+         TM Terminal SDK Features
+      </description>
+   </category-def>
 </site>
diff --git a/site/category.xml b/site/category.xml
deleted file mode 100644
index 58e44b5cb64..00000000000
--- a/site/category.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) 2018 Red Hat and others.
-    This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License 2.0
-    which accompanies this distribution, and is available at
-    https://www.eclipse.org/legal/epl-2.0/
-   
-    SPDX-License-Identifier: EPL-2.0
- -->
-
-<site>
-   <!-- 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_sdk"/></feature>
-   
-   <!-- Terminal Connector Features -->
-   <feature id="org.eclipse.tm.terminal.connector.local.feature"><category name="terminal_main"/></feature>
-   <feature id="org.eclipse.tm.terminal.connector.local.sdk.feature"><category name="terminal_sdk"/></feature>
-   <feature id="org.eclipse.tm.terminal.connector.cdtserial.feature"><category name="terminal_main"/></feature>
-   <feature id="org.eclipse.tm.terminal.connector.cdtserial.sdk.feature"><category name="terminal_sdk"/></feature>
-   <feature id="org.eclipse.tm.terminal.connector.ssh.feature"><category name="terminal_main"/></feature>
-   <feature id="org.eclipse.tm.terminal.connector.ssh.sdk.feature"><category name="terminal_sdk"/></feature>
-   <feature id="org.eclipse.tm.terminal.connector.telnet.feature"><category name="terminal_main"/></feature>
-   <feature id="org.eclipse.tm.terminal.connector.telnet.sdk.feature"><category name="terminal_sdk"/></feature>
-   <feature id="org.eclipse.tm.terminal.connector.remote.feature"><category name="terminal_main"/></feature>
-   <feature id="org.eclipse.tm.terminal.connector.remote.sdk.feature"><category name="terminal_sdk"/></feature>
-
-   <!-- Terminal View Features -->
-   <feature id="org.eclipse.tm.terminal.view.feature"><category name="terminal_main"/></feature>
-   <feature id="org.eclipse.tm.terminal.view.sdk.feature"><category name="terminal_sdk"/></feature>
-
-   <!-- 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_sdk"/></feature>
-
-   <bundle id="org.eclipse.tm.terminal.test"><category name="terminal_optional"/></bundle>
-   <bundle id="org.apache.commons.net"><category name="deps"/></bundle>
-
-   <!-- other hidden features / deps -->
-   <feature id="org.eclipse.cdt.native"/>
-
-   <category-def name="terminal_main" label="Terminal Features">
-      <description>
-         TM Terminal Features
-      </description>
-   </category-def>
-   <category-def name="terminal_sdk" label="Terminal SDK Features">
-      <description>
-         TM Terminal SDK Features
-      </description>
-   </category-def>
-   <category-def name="terminal_optional" label="Terminal Optional Add-Ons">
-      <description>
-         TM Terminal Examples, Tests
-      </description>
-   </category-def>
-
-
-   <category-def name="deps" label="Dependencies">
-      <description>
-         Dependencies
-      </description>
-   </category-def>
-</site>
diff --git a/site/pom.xml b/site/pom.xml
deleted file mode 100755
index f699ca1c9d2..00000000000
--- a/site/pom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) 2018 Red Hat and others.
-    This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License 2.0
-    which accompanies this distribution, and is available at
-    https://www.eclipse.org/legal/epl-2.0/
-   
-    SPDX-License-Identifier: EPL-2.0
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	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</groupId>
-		<artifactId>tm-parent</artifactId>
-		<version>4.5.100-SNAPSHOT</version>
-	</parent>
-
-	<groupId>org.eclipse.tm.rse</groupId>
-	<artifactId>org.eclipse.tm.site</artifactId>
-	<version>4.5.102-SNAPSHOT</version>
-	<packaging>eclipse-repository</packaging>
-</project>