diff --git a/pom.xml b/pom.xml
index aae84be7a4d..f96e65aec34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -280,6 +280,8 @@
 		<module>tools.templates/org.eclipse.tools.templates.freemarker.java11</module>
 		<module>tools.templates/org.eclipse.tools.templates.ui</module>
 
+		<module>terminal</module>
+
 		<module>releng/org.eclipse.cdt.native-feature</module>
 		<module>releng/org.eclipse.cdt</module>
 		<module>releng/org.eclipse.cdt.platform.branding</module>
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index 587c9ce0ad7..a8bcd2d96cf 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -79,6 +79,10 @@
 <unit id="org.eclipse.remote.serial.feature.group" version="0.0.0"/>
 <repository location="https://download.eclipse.org/tools/ptp/builds/remote/3.0/2020-03-M2/"/>
 </location>
+	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+		<repository location="https://download.eclipse.org/egit/updates"/>
+		<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+	</location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <launcherArgs>
diff --git a/terminal/admin/.gitignore b/terminal/admin/.gitignore
deleted file mode 100644
index ea8c4bf7f35..00000000000
--- a/terminal/admin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/terminal/admin/.project b/terminal/admin/.project
deleted file mode 100644
index fd600362323..00000000000
--- a/terminal/admin/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Administration (TM Terminal)</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>CONTRIBUTING</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/CONTRIBUTING</locationURI>
-		</link>
-		<link>
-			<name>pom.xml</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/pom.xml</locationURI>
-		</link>
-		<link>
-			<name>readme.txt</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/readme.txt</locationURI>
-		</link>
-		<link>
-			<name>terminals.psf</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/terminals.psf</locationURI>
-		</link>
-		<link>
-			<name>toplevel.gitignore</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/.gitignore</locationURI>
-		</link>
-	</linkedResources>
-</projectDescription>
diff --git a/terminal/admin/pom-build.xml b/terminal/admin/pom-build.xml
deleted file mode 100644
index 4da5f4544ea..00000000000
--- a/terminal/admin/pom-build.xml
+++ /dev/null
@@ -1,136 +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
-	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-config</artifactId>
-		<version>4.5.100-SNAPSHOT</version>
-		<relativePath>pom-config.xml</relativePath>
-	</parent>
-
-	<groupId>org.eclipse.tm.terminal</groupId>
-	<artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-	<packaging>pom</packaging>
-	<name>TM Terminal, Maven Build Master</name>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>target-platform-configuration</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-
-	<profiles>
-		<profile>
-			<id>findbugs</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>findbugs-maven-plugin</artifactId>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>static-checks</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>findbugs-maven-plugin</artifactId>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-pmd-plugin</artifactId>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>tests</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>target-platform-configuration</artifactId>
-						<configuration>
-							<dependency-resolution>
-								<extraRequirements>
-									<!-- product IU under test -->
-									<requirement>
-										<type>p2-installable-unit</type>
-										<id>org.eclipse.platform.ide</id>
-										<versionRange>0.0.0</versionRange>
-									</requirement>
-									<requirement>
-										<type>eclipse-feature</type>
-										<id>org.eclipse.sdk</id>
-										<versionRange>0.0.0</versionRange>
-									</requirement>
-									<requirement>
-										<type>eclipse-feature</type>
-										<id>org.eclipse.cdt.platform</id>
-										<versionRange>0.0.0</versionRange>
-									</requirement>
-									<requirement>
-										<type>eclipse-feature</type>
-										<id>org.eclipse.remote</id>
-										<versionRange>0.0.0</versionRange>
-									</requirement>
-									<requirement>
-										<type>eclipse-feature</type>
-										<id>org.eclipse.swtbot.eclipse</id>
-										<versionRange>0.0.0</versionRange>
-									</requirement>
-								</extraRequirements>
-							</dependency-resolution>
-						</configuration>
-					</plugin>
-					<plugin>
-						<groupId>org.jacoco</groupId>
-						<artifactId>jacoco-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<goals>
-									<goal>prepare-agent</goal>
-								</goals>
-								<configuration>
-									<includes>
-										<include>org.eclipse.tm.terminal*</include>
-									</includes>
-									<!-- <excludes> <exclude>org.eclipse.tm.terminal.test.*</exclude> 
-										</excludes> -->
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-	</profiles>
-</project>
diff --git a/terminal/admin/pom-config.xml b/terminal/admin/pom-config.xml
deleted file mode 100644
index 21a4dba63e9..00000000000
--- a/terminal/admin/pom-config.xml
+++ /dev/null
@@ -1,94 +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
-	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</groupId>
-    <artifactId>tm-parent</artifactId>
-    <version>4.5.100-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-
-	<groupId>org.eclipse.tm.terminal</groupId>
-	<artifactId>org.eclipse.tm.terminal.maven-config</artifactId>
-	<packaging>pom</packaging>
-	<name>TM Terminal, Maven Configuration Master</name>
-
-	<licenses>
-		<license>
-			<name>Eclipse Public License</name>
-			<url>https://www.eclipse.org/legal/epl-2.0/</url>
-			<distribution>repo</distribution>
-			<comments>
-            All rights reserved.
-
-            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/
-            </comments>
-		</license>
-	</licenses>
-
-	<organization>
-		<name>Eclipse Foundation</name>
-		<url>http://www.eclipse.org/</url>
-	</organization>
-
-	<properties>
-		<!-- Common global properties -->
-		<adminDir>${env.WORKSPACE}/admin</adminDir>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-		<!-- JaCoCo global properties -->
-		<jacoco.skip>false</jacoco.skip>
-		<jacoco.output>file</jacoco.output>
-		<jacoco.dumpOnExit>true</jacoco.dumpOnExit>
-
-		<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.git</tycho.scmUrl>
-	</properties>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-pmd-plugin</artifactId>
-					<version>3.8</version>
-					<configuration>
-						<sourceEncoding>utf-8</sourceEncoding>
-						<minimumTokens>100</minimumTokens>
-						<targetJdk>1.7</targetJdk>
-						<format>xml</format>
-						<failOnViolation>false</failOnViolation>
-						<excludes>
-							<exclude>**/UbcCheck.java</exclude>
-						</excludes>
-					</configuration>
-					<executions>
-						<execution>
-							<goals>
-								<goal>cpd-check</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-</project>
diff --git a/terminal/admin/target-defs/eclipse-4.8.x-photon.target b/terminal/admin/target-defs/eclipse-4.8.x-photon.target
deleted file mode 100644
index 39952d614f2..00000000000
--- a/terminal/admin/target-defs/eclipse-4.8.x-photon.target
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Terminals Eclipse 4.8.x (Photon)" sequenceNumber="1">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/>
-<repository location="http://archive.eclipse.org/tm/updates/rxtx"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
-<repository location="http://download.eclipse.org/cbi/updates/license"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.ide" version="4.8.0.I20171206-2000"/>
-<unit id="org.eclipse.test.feature.group" version="3.7.300.v20171130-1004"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.8milestones"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.egit.feature.group" version="4.9.1.201712030800-r"/>
-<repository location="http://download.eclipse.org/releases/photon"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.6.0.201706141832"/>
-<unit id="org.eclipse.swtbot.feature.group" version="2.6.0.201706141832"/>
-<unit id="org.eclipse.swtbot.forms.feature.group" version="2.6.0.201706141832"/>
-<unit id="org.eclipse.swtbot.ide.feature.group" version="2.6.0.201706141832"/>
-<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
-<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
-<repository location="http://download.eclipse.org/technology/swtbot/releases/latest"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.rse.feature.group" version="3.7.3.201704251225"/>
-<repository location="http://download.eclipse.org/tm/updates/4.3milestones"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.cdt.native.feature.group" version="9.3.2.201709131603"/>
-<repository location="http://download.eclipse.org/tools/cdt/builds/oxygen/milestones"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.remote.feature.group" version="3.0.0.201706052031"/>
-<repository location="http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.net" version="3.2.0.v201305141515"/>
-<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180119201206/repository"/>
-</location>
-</locations>
-</target>
diff --git a/terminal/admin/target-defs/tm-baseline.target b/terminal/admin/target-defs/tm-baseline.target
deleted file mode 100644
index e2b7e52557e..00000000000
--- a/terminal/admin/target-defs/tm-baseline.target
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="tm-baseline" sequenceNumber="2">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="http://download.eclipse.org/releases/neon"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.tm.terminal.connector.local" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.connector.process" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.connector.remote" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.connector.serial" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.connector.ssh" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.connector.telnet" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.view.core" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.view.ui" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.view.ui.rse" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tm/terminal/updates/4.2"/>
-</location>
-</locations>
-</target>
diff --git a/terminal/features/org.eclipse.tm.terminal.connector.cdtserial.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.connector.cdtserial.feature/pom.xml
deleted file mode 100644
index bf559ad5aea..00000000000
--- a/terminal/features/org.eclipse.tm.terminal.connector.cdtserial.feature/pom.xml
+++ /dev/null
@@ -1,44 +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
-    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.features</artifactId>
-		<version>4.5.100-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.tm.terminal.connector.cdtserial.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-  
-  <properties>
-  	<jacoco.skip>true</jacoco.skip>
-  </properties>
-  
-  <build>
-  	<pluginManagement>
-  		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-packaging-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<timestampProvider>default</timestampProvider>
-				</configuration>
-			</plugin>
-  		</plugins>
-  	</pluginManagement>
-  </build>
-</project>
diff --git a/terminal/features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature/pom.xml
deleted file mode 100644
index a02406184db..00000000000
--- a/terminal/features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature/pom.xml
+++ /dev/null
@@ -1,44 +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
-    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.features</artifactId>
-		<version>4.5.100-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.tm.terminal.connector.cdtserial.sdk.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-  
-  <properties>
-  	<jacoco.skip>true</jacoco.skip>
-  </properties>
-  
-  <build>
-  	<pluginManagement>
-  		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-packaging-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<timestampProvider>default</timestampProvider>
-				</configuration>
-			</plugin>
-  		</plugins>
-  	</pluginManagement>
-  </build>
-</project>
diff --git a/terminal/features/org.eclipse.tm.terminal.connector.local.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.connector.local.feature/pom.xml
deleted file mode 100644
index 215d3563580..00000000000
--- a/terminal/features/org.eclipse.tm.terminal.connector.local.feature/pom.xml
+++ /dev/null
@@ -1,44 +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
-    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.features</artifactId>
-		<version>4.5.100-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.tm.terminal.connector.local.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-  
-  <properties>
-  	<jacoco.skip>true</jacoco.skip>
-  </properties>
-  
-  <build>
-  	<pluginManagement>
-  		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-packaging-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<timestampProvider>default</timestampProvider>
-				</configuration>
-			</plugin>
-  		</plugins>
-  	</pluginManagement>
-  </build>
-</project>
diff --git a/terminal/features/org.eclipse.tm.terminal.connector.local.sdk.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.connector.local.sdk.feature/pom.xml
deleted file mode 100644
index ac14412495e..00000000000
--- a/terminal/features/org.eclipse.tm.terminal.connector.local.sdk.feature/pom.xml
+++ /dev/null
@@ -1,44 +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
-    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.features</artifactId>
-		<version>4.5.100-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.tm.terminal.connector.local.sdk.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-  
-  <properties>
-  	<jacoco.skip>true</jacoco.skip>
-  </properties>
-  
-  <build>
-  	<pluginManagement>
-  		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-packaging-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<timestampProvider>default</timestampProvider>
-				</configuration>
-			</plugin>
-  		</plugins>
-  	</pluginManagement>
-  </build>
-</project>
diff --git a/terminal/features/org.eclipse.tm.terminal.connector.remote.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.connector.remote.feature/pom.xml
deleted file mode 100644
index f4665073bf2..00000000000
--- a/terminal/features/org.eclipse.tm.terminal.connector.remote.feature/pom.xml
+++ /dev/null
@@ -1,44 +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
-    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.features</artifactId>
-		<version>4.5.100-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.tm.terminal.connector.remote.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-  
-  <properties>
-  	<jacoco.skip>true</jacoco.skip>
-  </properties>
-  
-  <build>
-  	<pluginManagement>
-  		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-packaging-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<timestampProvider>default</timestampProvider>
-				</configuration>
-			</plugin>
-  		</plugins>
-  	</pluginManagement>
-  </build>
-</project>
diff --git a/terminal/features/org.eclipse.tm.terminal.connector.remote.sdk.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.connector.remote.sdk.feature/pom.xml
deleted file mode 100644
index 3dee0088fac..00000000000
--- a/terminal/features/org.eclipse.tm.terminal.connector.remote.sdk.feature/pom.xml
+++ /dev/null
@@ -1,44 +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
-    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.features</artifactId>
-		<version>4.5.100-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.tm.terminal.connector.remote.sdk.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-  
-  <properties>
-  	<jacoco.skip>true</jacoco.skip>
-  </properties>
-  
-  <build>
-  	<pluginManagement>
-  		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-packaging-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<timestampProvider>default</timestampProvider>
-				</configuration>
-			</plugin>
-  		</plugins>
-  	</pluginManagement>
-  </build>
-</project>
diff --git a/terminal/features/org.eclipse.tm.terminal.connector.ssh.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.connector.ssh.feature/pom.xml
deleted file mode 100644
index 61100c70ff7..00000000000
--- a/terminal/features/org.eclipse.tm.terminal.connector.ssh.feature/pom.xml
+++ /dev/null
@@ -1,44 +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
-    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.features</artifactId>
-		<version>4.5.100-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.tm.terminal.connector.ssh.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-  
-  <properties>
-  	<jacoco.skip>true</jacoco.skip>
-  </properties>
-  
-  <build>
-  	<pluginManagement>
-  		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-packaging-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<timestampProvider>default</timestampProvider>
-				</configuration>
-			</plugin>
-  		</plugins>
-  	</pluginManagement>
-  </build>
-</project>
diff --git a/terminal/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/pom.xml
deleted file mode 100644
index e829e93606c..00000000000
--- a/terminal/features/org.eclipse.tm.terminal.connector.ssh.sdk.feature/pom.xml
+++ /dev/null
@@ -1,44 +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
-    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.features</artifactId>
-		<version>4.5.100-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.tm.terminal.connector.ssh.sdk.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-  
-  <properties>
-  	<jacoco.skip>true</jacoco.skip>
-  </properties>
-  
-  <build>
-  	<pluginManagement>
-  		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-packaging-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<timestampProvider>default</timestampProvider>
-				</configuration>
-			</plugin>
-  		</plugins>
-  	</pluginManagement>
-  </build>
-</project>
diff --git a/terminal/features/org.eclipse.tm.terminal.connector.telnet.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.connector.telnet.feature/pom.xml
deleted file mode 100644
index 49038af80cc..00000000000
--- a/terminal/features/org.eclipse.tm.terminal.connector.telnet.feature/pom.xml
+++ /dev/null
@@ -1,44 +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
-    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.features</artifactId>
-		<version>4.5.100-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.tm.terminal.connector.telnet.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-  
-  <properties>
-  	<jacoco.skip>true</jacoco.skip>
-  </properties>
-  
-  <build>
-  	<pluginManagement>
-  		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-packaging-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<timestampProvider>default</timestampProvider>
-				</configuration>
-			</plugin>
-  		</plugins>
-  	</pluginManagement>
-  </build>
-</project>
diff --git a/terminal/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/pom.xml
deleted file mode 100644
index b7efd30ce3d..00000000000
--- a/terminal/features/org.eclipse.tm.terminal.connector.telnet.sdk.feature/pom.xml
+++ /dev/null
@@ -1,44 +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
-    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.features</artifactId>
-		<version>4.5.100-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.tm.terminal.connector.telnet.sdk.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-  
-  <properties>
-  	<jacoco.skip>true</jacoco.skip>
-  </properties>
-  
-  <build>
-  	<pluginManagement>
-  		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-packaging-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<timestampProvider>default</timestampProvider>
-				</configuration>
-			</plugin>
-  		</plugins>
-  	</pluginManagement>
-  </build>
-</project>
diff --git a/terminal/features/org.eclipse.tm.terminal.control.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.control.feature/pom.xml
deleted file mode 100644
index 60580345f14..00000000000
--- a/terminal/features/org.eclipse.tm.terminal.control.feature/pom.xml
+++ /dev/null
@@ -1,45 +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
-	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.features</artifactId>
-		<version>4.5.100-SNAPSHOT</version>
-	</parent>
-	<version>4.5.102-SNAPSHOT</version>
-
-	<artifactId>org.eclipse.tm.terminal.control.feature</artifactId>
-	<packaging>eclipse-feature</packaging>
-
-	<properties>
-		<jacoco.skip>true</jacoco.skip>
-	</properties>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-packaging-plugin</artifactId>
-					<version>${tycho-version}</version>
-					<configuration>
-						<timestampProvider>default</timestampProvider>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-</project>
diff --git a/terminal/features/org.eclipse.tm.terminal.control.sdk.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.control.sdk.feature/pom.xml
deleted file mode 100644
index 0d4df06551b..00000000000
--- a/terminal/features/org.eclipse.tm.terminal.control.sdk.feature/pom.xml
+++ /dev/null
@@ -1,44 +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
-	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.features</artifactId>
-		<version>4.5.100-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>org.eclipse.tm.terminal.control.sdk.feature</artifactId>
-	<packaging>eclipse-feature</packaging>
-
-	<properties>
-		<jacoco.skip>true</jacoco.skip>
-	</properties>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-packaging-plugin</artifactId>
-					<version>${tycho-version}</version>
-					<configuration>
-						<timestampProvider>default</timestampProvider>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-</project>
diff --git a/terminal/features/org.eclipse.tm.terminal.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.feature/pom.xml
deleted file mode 100644
index 7794403d6bc..00000000000
--- a/terminal/features/org.eclipse.tm.terminal.feature/pom.xml
+++ /dev/null
@@ -1,45 +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
-	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.features</artifactId>
-		<version>4.5.100-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>org.eclipse.tm.terminal.feature</artifactId>
-	<version>4.5.200-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-
-	<properties>
-		<jacoco.skip>true</jacoco.skip>
-	</properties>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-packaging-plugin</artifactId>
-					<version>${tycho-version}</version>
-					<configuration>
-						<timestampProvider>default</timestampProvider>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-</project>
diff --git a/terminal/features/org.eclipse.tm.terminal.sdk.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.sdk.feature/pom.xml
deleted file mode 100644
index e5168cc7f29..00000000000
--- a/terminal/features/org.eclipse.tm.terminal.sdk.feature/pom.xml
+++ /dev/null
@@ -1,44 +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
-	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.features</artifactId>
-		<version>4.5.100-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>org.eclipse.tm.terminal.sdk.feature</artifactId>
-	<packaging>eclipse-feature</packaging>
-
-	<properties>
-		<jacoco.skip>true</jacoco.skip>
-	</properties>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-packaging-plugin</artifactId>
-					<version>${tycho-version}</version>
-					<configuration>
-						<timestampProvider>default</timestampProvider>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-</project>
diff --git a/terminal/features/org.eclipse.tm.terminal.view.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.view.feature/pom.xml
deleted file mode 100644
index 4188445839a..00000000000
--- a/terminal/features/org.eclipse.tm.terminal.view.feature/pom.xml
+++ /dev/null
@@ -1,45 +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
-	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.features</artifactId>
-		<version>4.5.100-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>org.eclipse.tm.terminal.view.feature</artifactId>
-	<version>4.5.200-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-	
-	<properties>
-		<jacoco.skip>true</jacoco.skip>
-	</properties>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-packaging-plugin</artifactId>
-					<version>${tycho-version}</version>
-					<configuration>
-						<timestampProvider>default</timestampProvider>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-</project>
diff --git a/terminal/features/org.eclipse.tm.terminal.view.sdk.feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.view.sdk.feature/pom.xml
deleted file mode 100644
index 74c6faf6ae7..00000000000
--- a/terminal/features/org.eclipse.tm.terminal.view.sdk.feature/pom.xml
+++ /dev/null
@@ -1,44 +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
-	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.features</artifactId>
-		<version>4.5.100-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>org.eclipse.tm.terminal.view.sdk.feature</artifactId>
-	<packaging>eclipse-feature</packaging>
-	
-	<properties>
-		<jacoco.skip>true</jacoco.skip>
-	</properties>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-packaging-plugin</artifactId>
-					<version>${tycho-version}</version>
-					<configuration>
-						<timestampProvider>default</timestampProvider>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-</project>
diff --git a/terminal/features/pom.xml b/terminal/features/pom.xml
index 1da93e88e52..f7d9d7a9036 100644
--- a/terminal/features/pom.xml
+++ b/terminal/features/pom.xml
@@ -15,10 +15,9 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.eclipse.tm.terminal</groupId>
-		<artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-		<version>4.5.100-SNAPSHOT</version>
-		<relativePath>../admin/pom-build.xml</relativePath>
+		<groupId>org.eclipse.cdt</groupId>
+		<artifactId>terminal-parent</artifactId>
+		<version>9.11.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.tm.terminal.features</artifactId>
@@ -37,6 +36,8 @@
 		<module>org.eclipse.tm.terminal.connector.ssh.sdk.feature</module>
 		<module>org.eclipse.tm.terminal.connector.telnet.feature</module>
 		<module>org.eclipse.tm.terminal.connector.telnet.sdk.feature</module>
+		<module>org.eclipse.tm.terminal.connector.cdtserial.feature</module>
+		<module>org.eclipse.tm.terminal.connector.cdtserial.sdk.feature</module>
 
 		<module>org.eclipse.tm.terminal.view.feature</module>
 		<module>org.eclipse.tm.terminal.view.sdk.feature</module>
@@ -46,24 +47,4 @@
 
 	</modules>
 
-	<profiles>
-		<profile>
-			<!-- The cdtserial connector can only be built with CDT Oxygen or newer. -->
-			<id>cdtserial</id>
-			<activation>
-				<!-- cdtserial is the future for master moving forward, so have it on 
-					by default. -->
-				<!-- This also affects the Gerrit validation job, which should work on 
-					cdtserial too. -->
-				<activeByDefault>true</activeByDefault>
-				<property>
-					<name>!nocdtserial</name>
-				</property>
-			</activation>
-			<modules>
-				<module>org.eclipse.tm.terminal.connector.cdtserial.feature</module>
-				<module>org.eclipse.tm.terminal.connector.cdtserial.sdk.feature</module>
-			</modules>
-		</profile>
-	</profiles>
 </project>
diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/pom.xml
deleted file mode 100644
index 2c35890725e..00000000000
--- a/terminal/plugins/org.eclipse.tm.terminal.connector.cdtserial/pom.xml
+++ /dev/null
@@ -1,26 +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
-    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.5.100-SNAPSHOT</version>
-    <relativePath>../../admin/pom-build.xml</relativePath>
-  </parent>
-
-  <artifactId>org.eclipse.tm.terminal.connector.cdtserial</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.local/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.connector.local/pom.xml
deleted file mode 100644
index 88f03dacc85..00000000000
--- a/terminal/plugins/org.eclipse.tm.terminal.connector.local/pom.xml
+++ /dev/null
@@ -1,26 +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
-    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.5.100-SNAPSHOT</version>
-    <relativePath>../../admin/pom-build.xml</relativePath>
-  </parent>
-
-  <artifactId>org.eclipse.tm.terminal.connector.local</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.process/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.connector.process/pom.xml
deleted file mode 100644
index e51c0e0e903..00000000000
--- a/terminal/plugins/org.eclipse.tm.terminal.connector.process/pom.xml
+++ /dev/null
@@ -1,26 +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
-    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.5.100-SNAPSHOT</version>
-    <relativePath>../../admin/pom-build.xml</relativePath>
-  </parent>
-
-  <artifactId>org.eclipse.tm.terminal.connector.process</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.remote/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.connector.remote/pom.xml
deleted file mode 100644
index c820a1d1594..00000000000
--- a/terminal/plugins/org.eclipse.tm.terminal.connector.remote/pom.xml
+++ /dev/null
@@ -1,26 +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
-    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.5.100-SNAPSHOT</version>
-    <relativePath>../../admin/pom-build.xml</relativePath>
-  </parent>
-
-  <artifactId>org.eclipse.tm.terminal.connector.remote</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/pom.xml
deleted file mode 100644
index ee95330809b..00000000000
--- a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/pom.xml
+++ /dev/null
@@ -1,26 +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
-    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.5.100-SNAPSHOT</version>
-    <relativePath>../../admin/pom-build.xml</relativePath>
-  </parent>
-
-  <artifactId>org.eclipse.tm.terminal.connector.ssh</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/pom.xml
deleted file mode 100644
index a6f4f6cdc21..00000000000
--- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/pom.xml
+++ /dev/null
@@ -1,26 +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
-    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.5.100-SNAPSHOT</version>
-    <relativePath>../../admin/pom-build.xml</relativePath>
-  </parent>
-
-  <artifactId>org.eclipse.tm.terminal.connector.telnet</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.control/pom.xml
deleted file mode 100644
index a0de87da146..00000000000
--- a/terminal/plugins/org.eclipse.tm.terminal.control/pom.xml
+++ /dev/null
@@ -1,27 +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
-    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.5.100-SNAPSHOT</version>
-    <relativePath>../../admin/pom-build.xml</relativePath>
-  </parent>
-  <version>4.5.102-SNAPSHOT</version>
-
-  <artifactId>org.eclipse.tm.terminal.control</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/terminal/plugins/org.eclipse.tm.terminal.test/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.test/pom.xml
deleted file mode 100644
index cb0115da7dc..00000000000
--- a/terminal/plugins/org.eclipse.tm.terminal.test/pom.xml
+++ /dev/null
@@ -1,194 +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
-    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.5.100-SNAPSHOT</version>
-    <relativePath>../../admin/pom-build.xml</relativePath>
-  </parent>
-
-  <artifactId>org.eclipse.tm.terminal.test</artifactId>
-	<packaging>eclipse-test-plugin</packaging>
-
-	<properties>
-		<jacoco.append>true</jacoco.append>
-		<ui.test.vmargs>-ea -Xmx512m -XX:MaxPermSize=256m -Drse.enableSecureStoreAccess=false -Dorg.eclipse.swt.browser.UseWebKitGTK=true</ui.test.vmargs>
-	</properties>
-
-	<profiles>
-		<profile>
-			<id>tests</id>
-
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>tycho-surefire-plugin</artifactId>
-						<version>${tycho-version}</version>
-						<configuration>
-							<useUIHarness>true</useUIHarness>
-							<useUIThread>false</useUIThread>
-							<product>org.eclipse.platform.ide</product>
-							<!-- tycho.testArgLine is filled by Jacoco prepare-agent -->
-							<!-- see http://www.eclemma.org/jacoco/trunk/doc/prepare-agent-mojo.html -->
-							<argLine>${tycho.testArgLine} ${ui.test.vmargs}</argLine>
-							<application>org.eclipse.ui.ide.workbench</application>
-							<testFailureIgnore>true</testFailureIgnore>
-							<showEclipseLog>true</showEclipseLog>
-							<testRuntime>p2Installed</testRuntime>
-							<!--
-							<debugPort>8003</debugPort>
-							-->
-							<systemProperties>
-								<osgi.debug>${basedir}/tracing/.options</osgi.debug>
-							</systemProperties>
-
-							<!--
-							<testSuite>org.eclipse.tm.terminal.test</testSuite>
-							<testClass>org.eclipse.tm.terminal.test.AutomatedPluginTests</testClass>
-							-->
-							<includes>
-								<include>**/AutomatedPluginTests.*</include>
-								<include>**/AutomatedTests.*</include>
-							</includes>
-						</configuration>
-					</plugin>
-
-					<plugin>
-						<groupId>org.codehaus.gmaven</groupId>
-						<artifactId>gmaven-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>validate</phase>
-								<goals>
-									<goal>execute</goal>
-								</goals>
-								<configuration>
-									<source>
-									project.properties['qualified.bundle.version'] = project.properties['unqualifiedVersion'].replace('qualifier', project.properties['buildQualifier'])
-									</source>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>generate-report</id>
-								<phase>post-integration-test</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<target>
-										<typedef resource="org/jacoco/ant/antlib.xml"/>
-										<echo message="Coverage report"/>
-										<report>
-											<executiondata>
-												<fileset dir="${project.build.directory}" includes="jacoco.exec"/>
-											</executiondata>
-											<structure name="Code Coverage - TM Terminal">
-												<group name="org.eclipse.tm.terminal.control">
-													<classfiles>
-														<fileset dir="${basedir}/../org.eclipse.tm.terminal.control/target/classes"/>
-													</classfiles>
-													<sourcefiles>
-														<fileset dir="${basedir}/../org.eclipse.tm.terminal.control/src"/>
-													</sourcefiles>
-												</group>
-
-												<group name="org.eclipse.tm.terminal.view.ui">
-													<classfiles>
-														<fileset dir="${basedir}/../org.eclipse.tm.terminal.view.ui/target/classes"/>
-													</classfiles>
-													<sourcefiles>
-														<fileset dir="${basedir}/../org.eclipse.tm.terminal.view.ui/src"/>
-													</sourcefiles>
-												</group>
-
-												<group name="org.eclipse.tm.terminal.view.core">
-													<classfiles>
-														<fileset dir="${basedir}/../org.eclipse.tm.terminal.view.core/target/classes"/>
-													</classfiles>
-													<sourcefiles>
-														<fileset dir="${basedir}/../org.eclipse.tm.terminal.view.core/src"/>
-													</sourcefiles>
-												</group>
-										
-												<group name="org.eclipse.tm.terminal.connector.process">
-													<classfiles>
-														<fileset dir="${basedir}/../org.eclipse.tm.terminal.connector.process/target/classes"/>
-													</classfiles>
-													<sourcefiles>
-														<fileset dir="${basedir}/../org.eclipse.tm.terminal.connector.process/src"/>
-													</sourcefiles>
-												</group>
-										
-												<group name="org.eclipse.tm.terminal.connector.local">
-													<classfiles>
-														<fileset dir="${basedir}/../org.eclipse.tm.terminal.connector.local/target/classes"/>
-													</classfiles>
-													<sourcefiles>
-														<fileset dir="${basedir}/../org.eclipse.tm.terminal.connector.local/src"/>
-													</sourcefiles>
-												</group>
-
-												<group name="org.eclipse.tm.terminal.connector.ssh">
-													<classfiles>
-														<fileset dir="${basedir}/../org.eclipse.tm.terminal.connector.ssh/target/classes"/>
-													</classfiles>
-													<sourcefiles>
-														<fileset dir="${basedir}/../org.eclipse.tm.terminal.connector.ssh/src"/>
-													</sourcefiles>
-												</group>
-
-												<group name="org.eclipse.tm.terminal.test">
-													<classfiles>
-														<fileset dir="${basedir}/../org.eclipse.tm.terminal.test/target/classes"/>
-													</classfiles>
-													<sourcefiles>
-														<fileset dir="${basedir}/../org.eclipse.tm.terminal.test/src"/>
-													</sourcefiles>
-												</group>
-											</structure>
-
-											<html destdir="${project.build.directory}/coverage"
-										  		  footer="Code Coverage Report for TM Terminal ${qualified.bundle.version}"
-										  		  locale="de"/>
-											<csv destfile="${project.build.directory}/coverage/coverage.csv"/>
-											<xml destfile="${project.build.directory}/coverage/coverage.xml"/>
-										</report>
-									</target>
-								</configuration>
-							</execution>
-						</executions>
-						<dependencies>
-							<dependency>
-								<groupId>org.jacoco</groupId>
-								<artifactId>org.jacoco.ant</artifactId>
-								<version>${jacoco-version}</version>
-							</dependency>
-						</dependencies>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>
diff --git a/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedIntegrationSuite.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedIntegrationSuite.java
new file mode 100644
index 00000000000..53c15d52e60
--- /dev/null
+++ b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedIntegrationSuite.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2020 Kichwa Coders Canada 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
+ *******************************************************************************/
+package org.eclipse.tm.terminal.test;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({ AutomatedPluginTests.class, AutomatedTests.class })
+public class AutomatedIntegrationSuite {
+
+}
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.view.core/pom.xml
deleted file mode 100644
index 0e4856a9fd6..00000000000
--- a/terminal/plugins/org.eclipse.tm.terminal.view.core/pom.xml
+++ /dev/null
@@ -1,26 +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
-    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.5.100-SNAPSHOT</version>
-    <relativePath>../../admin/pom-build.xml</relativePath>
-  </parent>
-
-  <artifactId>org.eclipse.tm.terminal.view.core</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.view.ui/pom.xml
deleted file mode 100644
index b23790d92b0..00000000000
--- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/pom.xml
+++ /dev/null
@@ -1,27 +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
-    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.5.100-SNAPSHOT</version>
-    <relativePath>../../admin/pom-build.xml</relativePath>
-  </parent>
-
-  <artifactId>org.eclipse.tm.terminal.view.ui</artifactId>
-  <version>4.5.200-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/terminal/plugins/pom.xml b/terminal/plugins/pom.xml
index 64a12adce3c..11b2560824a 100644
--- a/terminal/plugins/pom.xml
+++ b/terminal/plugins/pom.xml
@@ -15,10 +15,9 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.eclipse.tm.terminal</groupId>
-		<artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-		<version>4.5.100-SNAPSHOT</version>
-		<relativePath>../admin/pom-build.xml</relativePath>
+		<groupId>org.eclipse.cdt</groupId>
+		<artifactId>terminal-parent</artifactId>
+		<version>9.11.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.tm.terminal.plugins</artifactId>
@@ -33,48 +32,11 @@
 		<module>org.eclipse.tm.terminal.connector.remote</module>
 		<module>org.eclipse.tm.terminal.connector.ssh</module>
 		<module>org.eclipse.tm.terminal.connector.telnet</module>
+		<module>org.eclipse.tm.terminal.connector.cdtserial</module>
 
 		<module>org.eclipse.tm.terminal.view.core</module>
 		<module>org.eclipse.tm.terminal.view.ui</module>
 
 		<module>org.eclipse.tm.terminal.test</module>
 	</modules>
-
-	<profiles>
-		<profile>
-			<!-- The cdtserial connector can only be built with CDT Oxygen or newer. -->
-			<id>cdtserial</id>
-			<activation>
-				<!-- cdtserial is the future for master moving forward, so have it on 
-					by default. -->
-				<!-- This also affects the Gerrit validation job, which should work on 
-					cdtserial too. -->
-				<activeByDefault>true</activeByDefault>
-				<property>
-					<name>!nocdtserial</name>
-				</property>
-			</activation>
-			<modules>
-				<module>org.eclipse.tm.terminal.connector.cdtserial</module>
-			</modules>
-		</profile>
-		<profile>
-			<!-- Bug 536800 depends on gnu.io.rxtx which is a workswith dep we are not allowed to redistribute --> 
-			<!-- The rxtxserial connector doesn't build on MacOSX. -->
-			<id>rxtxserial</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<!-- Bug 536800 remove from reactor <modules>
-				<module>org.eclipse.tm.terminal.connector.serial</module>
-			</modules> -->
-			<repositories>
-				<repository>
-					<id>rxtx</id>
-					<url>http://archive.eclipse.org/tm/updates/rxtx</url>
-					<layout>p2</layout>
-				</repository>
-			</repositories>
-		</profile>
-	</profiles>
 </project>
diff --git a/terminal/pom.xml b/terminal/pom.xml
index f0f3a77dc8a..e7404e80882 100644
--- a/terminal/pom.xml
+++ b/terminal/pom.xml
@@ -15,14 +15,14 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.eclipse.tm.terminal</groupId>
-		<artifactId>org.eclipse.tm.terminal.maven-build</artifactId>
-		<version>4.5.100-SNAPSHOT</version>
-		<relativePath>admin/pom-build.xml</relativePath>
+		<groupId>org.eclipse.cdt</groupId>
+		<artifactId>cdt-parent</artifactId>
+		<version>9.11.0-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.eclipse.tm.terminal</groupId>
+	<groupId>org.eclipse.cdt</groupId>
 	<artifactId>terminal-parent</artifactId>
+	<version>9.11.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>TM Terminal, Maven Master</name>