diff --git a/pom.xml b/pom.xml
index d090c8567fe..f6dbc6f8bea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,116 +1,331 @@
 <?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>
-
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
-
-    <parent>
-        <groupId>org.eclipse.tm</groupId>
-        <artifactId>org.eclipse.tm.maven-build</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-        <relativePath>admin/pom-build.xml</relativePath>
-    </parent>
+		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>
 
     <groupId>org.eclipse.tm</groupId>
-    <artifactId>tm-parent-old</artifactId>
+    <artifactId>tm-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Target Management Parent</name>
 
+
+  <properties>
+    <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.git</tycho.scmUrl>
+    <tycho-version>1.0.0</tycho-version>
+    <tycho-extras-version>1.0.0</tycho-extras-version>
+    <maven-resources-version>2.6</maven-resources-version>
+    <sdk-version>4.8milestones/S-4.8M4-201712062000</sdk-version>
+
+
+    <!-- Set up the default target platform to build against -->
+    <license-site>http://download.eclipse.org/cbi/updates/license</license-site>
+    <platform-site>http://download.eclipse.org/eclipse/updates/${sdk-version}</platform-site>
+    <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository</orbit-site>
+    <cdt-site>http://download.eclipse.org/tools/cdt/releases/8.6</cdt-site>
+    <terminal-site>http://download.eclipse.org/tm/terminal/builds/development/nightly</terminal-site>
+  </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>orbit</id>
+            <url>${orbit-site}</url>
+            <layout>p2</layout>
+        </repository>
+        <repository>
+            <id>cdt</id>
+            <url>${cdt-site}</url>
+            <layout>p2</layout>
+        </repository>
+        <repository>
+            <id>terminal</id>
+            <url>${terminal-site}</url>
+            <layout>p2</layout>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>sonatype</id>
+            <url>http://oss.sonatype.org/content/repositories/public</url>
+              <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </pluginRepository>
+        <pluginRepository>                                                                                         
+            <id>cbi</id>                                                                                         
+            <url>http://repo.eclipse.org/content/repositories/cbi-releases/</url>                                             
+        </pluginRepository>
+        <pluginRepository>
+                <id>cbi-snapshots</id>
+                <url>http://repo.eclipse.org/content/repositories/cbi-snapshots/</url>
+        </pluginRepository>
+    </pluginRepositories>
+    <build>
+      <plugins>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-maven-plugin</artifactId>
+          <version>${tycho-version}</version>
+          <extensions>true</extensions>
+        </plugin>
+      </plugins>
+      <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.eclipse.tycho</groupId>
+                    <artifactId>tycho-maven-plugin</artifactId>
+                    <version>${tycho-version}</version>
+                    <extensions>true</extensions>
+                </plugin>
+                <plugin>
+                    <groupId>org.eclipse.tycho</groupId>
+                    <artifactId>target-platform-configuration</artifactId>
+                    <version>${tycho-version}</version>
+                    <configuration>
+                        <environments>
+                            <environment>
+                                <os>linux</os>
+                                <ws>gtk</ws>
+                                <arch>x86</arch>
+                            </environment>
+                            <environment>
+                                <os>linux</os>
+                                <ws>gtk</ws>
+                                <arch>x86_64</arch>
+                            </environment>
+                            <environment>
+                                <os>win32</os>
+                                <ws>win32</ws>
+                                <arch>x86</arch>
+                            </environment>
+                            <environment>
+                                <os>win32</os>
+                                <ws>win32</ws>
+                                <arch>x86_64</arch>
+                            </environment>
+                        </environments>
+                        <resolver>p2</resolver>
+                        <ignoreTychoRepositories>true</ignoreTychoRepositories>
+                        <includePackedArtifacts>true</includePackedArtifacts>
+                        <pomDependencies>consider</pomDependencies>
+                        <filters>
+                            <filter>
+                                <type>eclipse-plugin</type>
+                                <id>org.apache.commons.net</id>
+                                <restrictTo>
+                                    <versionRange>[3.2,3.3)</versionRange>
+                                </restrictTo>
+                            </filter>
+                            <filter>
+                                <type>eclipse-plugin</type>
+                                <id>org.apache.commons.net.source</id>
+                                <restrictTo>
+                                    <versionRange>[3.2,3.3)</versionRange>
+                                </restrictTo>
+                            </filter>
+                        </filters>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.eclipse.tycho</groupId>
+                    <artifactId>tycho-compiler-plugin</artifactId>
+                    <version>${tycho-version}</version>
+                    <configuration>
+                        <encoding>UTF-8</encoding>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.eclipse.tycho</groupId>
+                    <artifactId>tycho-source-plugin</artifactId>
+                    <version>${tycho-version}</version>
+                    <configuration>
+                        <encoding>UTF-8</encoding>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>plugin-source</id>
+                            <goals>
+                                <goal>plugin-source</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.eclipse.tycho</groupId>
+                    <artifactId>tycho-packaging-plugin</artifactId>
+                    <version>${tycho-version}</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.eclipse.tycho.extras</groupId>
+                            <artifactId>tycho-buildtimestamp-jgit</artifactId>
+                            <version>${tycho-version}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.eclipse.tycho.extras</groupId>
+                            <artifactId>tycho-sourceref-jgit</artifactId>
+                            <version>${tycho-extras-version}</version>
+                        </dependency>
+                    </dependencies>
+                    <configuration>
+                        <strictBinIncludes>false</strictBinIncludes>
+                        <timestampProvider>jgit</timestampProvider>
+                        <jgit.ignore>pom.xml</jgit.ignore>
+                        <jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
+                        <sourceReferences>
+                            <generate>true</generate>
+                        </sourceReferences>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.eclipse.tycho</groupId>
+                    <artifactId>tycho-p2-repository-plugin</artifactId>
+                    <version>${tycho-version}</version>
+                    <configuration>
+                        <finalName>${project.artifactId}</finalName>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>${maven-resources-version}</version>
+                    <configuration>
+                        <encoding>UTF-8</encoding>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>${maven-antrun-version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.gmaven</groupId>
+                    <artifactId>gmaven-plugin</artifactId>
+                    <version>${gmaven-version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>findbugs-maven-plugin</artifactId>
+                    <version>${findbugs-version}</version>
+                    <configuration>
+                        <encoding>UTF-8</encoding>
+                        <effort>Max</effort>
+                        <threshold>Low</threshold>
+                        <xmlOutput>true</xmlOutput>
+                        <failOnError>false</failOnError>
+                        <excludeFilterFile>${adminDir}/findbugs-exclude.xml</excludeFilterFile>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>check</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>      
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <version>${jacoco-version}</version>
+                </plugin>
+                
+                <!-- Pack200 and Signing -->
+                <plugin>
+                    <groupId>org.eclipse.tycho.extras</groupId>
+                    <artifactId>tycho-pack200a-plugin</artifactId>
+                    <version>${tycho-version}</version>
+                    <executions>
+                        <execution>
+                            <id>pack200-normalize</id>
+                            <phase>verify</phase>
+                            <goals>
+                                <goal>normalize</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.eclipse.cbi.maven.plugins</groupId>
+                    <artifactId>eclipse-jarsigner-plugin</artifactId>
+                    <version>${eclipse-jarsigner-version}</version>
+                    <executions>
+                        <execution>
+                            <id>sign</id>
+                            <phase>verify</phase>
+                            <goals>
+                                <goal>sign</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.eclipse.tycho.extras</groupId>
+                    <artifactId>tycho-pack200b-plugin</artifactId>
+                    <version>${tycho-version}</version>
+                    <executions>
+                        <execution>
+                            <id>pack200-pack</id>
+                            <phase>verify</phase>
+                            <goals>
+                                <goal>pack</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <!-- Keep the tycho-p2-plugin after the tycho-pack200b-plugin -->
+                <!-- Tycho p2 metadata generation shall happen _after_ the JAR has been packed. -->
+                <plugin>
+                    <groupId>org.eclipse.tycho</groupId>
+                    <artifactId>tycho-p2-plugin</artifactId>
+                    <version>${tycho-version}</version>
+                    <!-- Signing appears to mess with the baseline repository logic.
+                         Disable the baseline repository until we've figured out what is going on. -->
+                    <!--                    
+                    <configuration>
+                        <baselineRepositories>
+                            <repository>
+                                <url>http://download.eclipse.org/tools/tm/builds/${tm-stream}/nightly</url>
+                            </repository>
+                        </baselineRepositories>
+                    </configuration>
+                    -->
+                    <executions>
+                        <execution>
+                            <id>p2-metadata</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>p2-metadata</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <defaultP2Metadata>false</defaultP2Metadata>
+                    </configuration>
+                </plugin>
+            </plugins>
+      </pluginManagement>
+    </build>
+
+
     <modules>
-        <!-- RSE features and plug-ins -->
-        <module>rse/doc/org.eclipse.dstore.doc.isv</module>
-        <module>rse/doc/org.eclipse.rse.doc.isv</module>
-        <module>rse/doc/org.eclipse.rse.doc.user</module>
-        <module>rse/examples/org.eclipse.rse.examples-feature</module>
-        <module>rse/examples/org.eclipse.rse.examples.daytime</module>
-        <module>rse/examples/org.eclipse.rse.examples.dstore</module>
-        <module>rse/examples/org.eclipse.rse.examples.tutorial</module>
-        <module>rse/features/org.eclipse.rse-feature</module>
-        <module>rse/features/org.eclipse.rse.core-feature</module>
-        <module>rse/features/org.eclipse.rse.core.source</module>
-        <module>rse/features/org.eclipse.rse.dstore-feature</module>
-        <module>rse/features/org.eclipse.rse.dstore.source</module>
-        <module>rse/features/org.eclipse.rse.ftp-feature</module>
-        <module>rse/features/org.eclipse.rse.ftp.source</module>
-        <module>rse/features/org.eclipse.rse.local-feature</module>
-        <module>rse/features/org.eclipse.rse.local.source</module>
-        <module>rse/features/org.eclipse.rse.scp-feature</module>
-        <module>rse/features/org.eclipse.rse.sdk-feature</module>
-        <module>rse/features/org.eclipse.rse.ssh-feature</module>
-        <module>rse/features/org.eclipse.rse.ssh.source</module>
-        <module>rse/features/org.eclipse.rse.telnet-feature</module>
-        <module>rse/features/org.eclipse.rse.telnet.source</module>
-        <module>rse/features/org.eclipse.rse.terminals-feature</module>
-        <module>rse/features/org.eclipse.rse.terminals.source</module>
-        <module>rse/features/org.eclipse.rse.useractions-feature</module>
-        <module>rse/plugins/org.eclipse.dstore.core</module>
-        <module>rse/plugins/org.eclipse.dstore.extra</module>
-        <module>rse/plugins/org.eclipse.rse</module>
-        <module>rse/plugins/org.eclipse.rse.connectorservice.dstore</module>
-        <module>rse/plugins/org.eclipse.rse.connectorservice.local</module>
-        <module>rse/plugins/org.eclipse.rse.connectorservice.ssh</module>
-        <module>rse/plugins/org.eclipse.rse.connectorservice.telnet</module>
-        <module>rse/plugins/org.eclipse.rse.core</module>
-        <module>rse/plugins/org.eclipse.rse.dstore.security</module>
-        <module>rse/plugins/org.eclipse.rse.efs</module>
-        <module>rse/plugins/org.eclipse.rse.efs.ui</module>
-        <module>rse/plugins/org.eclipse.rse.files.ui</module>
-        <module>rse/plugins/org.eclipse.rse.importexport</module>
-        <module>rse/plugins/org.eclipse.rse.processes.ui</module>
-        <module>rse/plugins/org.eclipse.rse.sdk</module>
-        <module>rse/plugins/org.eclipse.rse.services</module>
-        <module>rse/plugins/org.eclipse.rse.services.dstore</module>
-        <module>rse/plugins/org.eclipse.rse.services.files.ftp</module>
-        <module>rse/plugins/org.eclipse.rse.services.local</module>
-        <module>rse/plugins/org.eclipse.rse.services.ssh</module>
-        <module>rse/plugins/org.eclipse.rse.services.telnet</module>
-        <module>rse/plugins/org.eclipse.rse.shells.ui</module>
-        <module>rse/plugins/org.eclipse.rse.subsystems.files.core</module>
-        <module>rse/plugins/org.eclipse.rse.subsystems.files.dstore</module>
-        <module>rse/plugins/org.eclipse.rse.subsystems.files.ftp</module>
-        <module>rse/plugins/org.eclipse.rse.subsystems.files.local</module>
-        <module>rse/plugins/org.eclipse.rse.subsystems.files.scp</module>
-        <module>rse/plugins/org.eclipse.rse.subsystems.files.ssh</module>
-        <module>rse/plugins/org.eclipse.rse.subsystems.processes.core</module>
-        <module>rse/plugins/org.eclipse.rse.subsystems.processes.dstore</module>
-        <module>rse/plugins/org.eclipse.rse.subsystems.processes.local</module>
-        <module>rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux</module>
-        <module>rse/plugins/org.eclipse.rse.subsystems.shells.core</module>
-        <module>rse/plugins/org.eclipse.rse.subsystems.shells.dstore</module>
-        <module>rse/plugins/org.eclipse.rse.subsystems.shells.local</module>
-        <module>rse/plugins/org.eclipse.rse.subsystems.shells.ssh</module>
-        <module>rse/plugins/org.eclipse.rse.subsystems.shells.telnet</module>
-        <module>rse/plugins/org.eclipse.rse.subsystems.terminals.core</module>
-        <module>rse/plugins/org.eclipse.rse.subsystems.terminals.ssh</module>
-        <module>rse/plugins/org.eclipse.rse.terminals.ui</module>
-        <module>rse/plugins/org.eclipse.rse.ui</module>
-        <module>rse/plugins/org.eclipse.rse.ui.capabilities</module>
-        <module>rse/plugins/org.eclipse.rse.useractions</module>
-        <!-- <module>rse/plugins/org.eclipse.rse.useractions.sdk</module> -->
-        <!-- <module>rse/features/org.eclipse.rse.useractions.sdk-feature</module> -->
-
-        <!-- Windows CE subsystem and support for RSE -->
-        <module>wince/org.eclipse.rse.wince-feature</module>
-        <module>wince/org.eclipse.rse.subsystems.wince</module>
-        <module>wince/org.eclipse.tm.rapi</module>
-        
-        <module>releng/org.eclipse.tm.repo</module>
+	    <!-- RSE features and plug-ins -->
+	    <module>rse</module>
+            <!-- Windows CE subsystem and support for RSE -->
+            <module>wince</module>
     </modules>
-
-    <profiles>
-        <profile>
-        <id>tests</id>
-        <modules>
-            <module>rse/tests/org.eclipse.rse.tests</module>
-            <module>rse/tests/org.eclipse.rse.tests-feature</module>
-            <module>rse/tests/org.eclipse.rse.tests.framework</module>
-            <module>rse/tests/org.eclipse.rse.tests.framework.examples</module>
-        </modules>
-    </profile>
-    </profiles>
 </project>
diff --git a/releng/org.eclipse.tm.repo/.project b/releng/org.eclipse.tm.repo/.project
deleted file mode 100644
index 48b339b03f7..00000000000
--- a/releng/org.eclipse.tm.repo/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tm.repo</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.tm.repo/pom.xml b/releng/org.eclipse.tm.repo/pom.xml
deleted file mode 100644
index c73dee2fea1..00000000000
--- a/releng/org.eclipse.tm.repo/pom.xml
+++ /dev/null
@@ -1,118 +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>
-        <artifactId>org.eclipse.tm.maven-build</artifactId>
-        <groupId>org.eclipse.tm</groupId>
-        <version>4.0.0-SNAPSHOT</version>
-        <relativePath>../../admin/pom-build.xml</relativePath>
-    </parent>
-
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <artifactId>org.eclipse.tm.repo</artifactId>
-    <packaging>eclipse-repository</packaging>
-
-    <profiles>
-        <profile>
-            <id>build-server</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>prepare-serverruntime</id>
-                                <phase>prepare-package</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <target>
-                                        <property name="buildDirectory" value="${project.build.directory}/../../../"/>
-                                        <property name="builder" value="${project.build.directory}/../../../releng/"/>
-                                        <property name="buildId" value="3.6.0"/>
-                                        <ant antfile="${project.build.directory}/../../../dstoreTargets-git.xml">
-                                            <target name="serverruntime"/>
-                                        </ant>
-                                    </target>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>deploy</id>
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <target>
-                                        <delete includeemptydirs="false">
-                                            <fileset dir="${tm-install}">
-                                                <include name="**"/>
-                                            </fileset>
-                                        </delete>
-                                        <copy includeemptydirs="false" todir="${tm-install}">
-                                            <fileset dir="target/repository">
-                                                <include name="**"/>
-                                            </fileset>
-                                            <fileset dir="target">
-                                                <include name="${tm-zipfile}"/>
-                                            </fileset>
-                                        </copy>
-                                        <copy includeemptydirs="false" todir="${tm-install}/rseserver">
-                                            <fileset dir="${project.build.directory}/../../../">
-                                                <include name="rseserver*"/>
-                                            </fileset>
-                                        </copy>
-                                        <chmod perm="g+w">
-                                            <fileset dir="${tm-install}">
-                                                <include name="**"/>
-                                            </fileset>
-                                        </chmod>
-                                    </target>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>local-build</id>
-            <properties>
-                <tm-install>${project.build.directory}/../../../../</tm-install>
-                <tm-zipfile>${project.artifactId}.zip</tm-zipfile>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>deploy</id>
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <target>
-                                        <copy file="target/${tm-zipfile}" todir="${tm-install}">
-                                        </copy>
-                                        <chmod perm="g+w">
-                                            <fileset dir="${tm-install}">
-                                                <include name="**"/>
-                                            </fileset>
-                                        </chmod>
-                                    </target>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/pom.xml b/rse/doc/org.eclipse.dstore.doc.isv/pom.xml
index 2565becfe22..1ba4c781629 100644
--- a/rse/doc/org.eclipse.dstore.doc.isv/pom.xml
+++ b/rse/doc/org.eclipse.dstore.doc.isv/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.doc</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.dstore.doc.isv</artifactId>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/pom.xml b/rse/doc/org.eclipse.rse.doc.isv/pom.xml
index a9bfbba544b..35e0c674d15 100644
--- a/rse/doc/org.eclipse.rse.doc.isv/pom.xml
+++ b/rse/doc/org.eclipse.rse.doc.isv/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.doc</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.doc.isv</artifactId>
diff --git a/rse/doc/org.eclipse.rse.doc.user/pom.xml b/rse/doc/org.eclipse.rse.doc.user/pom.xml
index 912e690e3f8..693beb439bd 100644
--- a/rse/doc/org.eclipse.rse.doc.user/pom.xml
+++ b/rse/doc/org.eclipse.rse.doc.user/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.doc</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.doc.user</artifactId>
diff --git a/rse/doc/pom.xml b/rse/doc/pom.xml
new file mode 100644
index 00000000000..b85e19a6eb9
--- /dev/null
+++ b/rse/doc/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2017 Eclipse Foundation and others.
+  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) - initial implementation
+    Rob Stryker (Red Hat) - 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.tm.rse</groupId>
+    <artifactId>org.eclipse.tm.rse</artifactId>
+    <version>3.6.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.eclipse.tm.rse</groupId>
+  <artifactId>org.eclipse.tm.rse.doc</artifactId>
+  <version>3.6.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>org.eclipse.dstore.doc.isv</module>
+    <module>org.eclipse.rse.doc.isv</module>
+    <module>org.eclipse.rse.doc.user</module>
+  </modules>
+</project>
diff --git a/rse/examples/org.eclipse.rse.examples-feature/feature.xml b/rse/examples/org.eclipse.rse.examples-feature/feature.xml
index 14be8b0d7c4..8af4d12cb60 100644
--- a/rse/examples/org.eclipse.rse.examples-feature/feature.xml
+++ b/rse/examples/org.eclipse.rse.examples-feature/feature.xml
@@ -62,7 +62,7 @@
          install-size="33"
          version="0.0.0"
          unpack="false"/>
-
+ <!--
    <plugin
          id="org.eclipse.rse.examples.daytime.source"
          download-size="0"
@@ -76,5 +76,5 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
+-->
 </feature>
diff --git a/rse/examples/org.eclipse.rse.examples-feature/pom.xml b/rse/examples/org.eclipse.rse.examples-feature/pom.xml
index ee47d54d0f3..8633f971cc6 100644
--- a/rse/examples/org.eclipse.rse.examples-feature/pom.xml
+++ b/rse/examples/org.eclipse.rse.examples-feature/pom.xml
@@ -3,13 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.examples</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.examples</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/pom.xml b/rse/examples/org.eclipse.rse.examples.daytime/pom.xml
index 0ebf70e0367..4a7deabc7d3 100644
--- a/rse/examples/org.eclipse.rse.examples.daytime/pom.xml
+++ b/rse/examples/org.eclipse.rse.examples.daytime/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.examples</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.examples.daytime</artifactId>
diff --git a/rse/examples/org.eclipse.rse.examples.dstore/pom.xml b/rse/examples/org.eclipse.rse.examples.dstore/pom.xml
index cf0fd88d595..77a9f105559 100644
--- a/rse/examples/org.eclipse.rse.examples.dstore/pom.xml
+++ b/rse/examples/org.eclipse.rse.examples.dstore/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.examples</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.examples.dstore</artifactId>
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/pom.xml b/rse/examples/org.eclipse.rse.examples.tutorial/pom.xml
index 05e3b9dbbcc..bcace7cd5a1 100644
--- a/rse/examples/org.eclipse.rse.examples.tutorial/pom.xml
+++ b/rse/examples/org.eclipse.rse.examples.tutorial/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.examples</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.examples.tutorial</artifactId>
diff --git a/rse/examples/pom.xml b/rse/examples/pom.xml
new file mode 100644
index 00000000000..b996ef07314
--- /dev/null
+++ b/rse/examples/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2017 Eclipse Foundation and others.
+  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) - initial implementation
+    Rob Stryker (Red Hat) - 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.tm.rse</groupId>
+    <artifactId>org.eclipse.tm.rse</artifactId>
+    <version>3.6.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.eclipse.tm.rse</groupId>
+  <artifactId>org.eclipse.tm.rse.examples</artifactId>
+  <version>3.6.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>org.eclipse.rse.examples.daytime</module>
+    <module>org.eclipse.rse.examples.dstore</module>
+    <module>org.eclipse.rse.examples-feature</module>
+    <module>org.eclipse.rse.examples.tutorial</module>
+  </modules>
+</project>
diff --git a/rse/features/org.eclipse.rse-feature/pom.xml b/rse/features/org.eclipse.rse-feature/pom.xml
index f11c273bb1f..2d18ed835bf 100644
--- a/rse/features/org.eclipse.rse-feature/pom.xml
+++ b/rse/features/org.eclipse.rse-feature/pom.xml
@@ -3,14 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.features</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse</artifactId>
-  <version>3.7.3.qualifier</version>
+  <version>3.7.3-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.core-feature/pom.xml b/rse/features/org.eclipse.rse.core-feature/pom.xml
index 6a1bc327706..97b67a5b369 100644
--- a/rse/features/org.eclipse.rse.core-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.core-feature/pom.xml
@@ -3,14 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.features</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.core</artifactId>
-  <version>3.7.3.qualifier</version>
+  <version>3.7.3-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.core.source/pom.xml b/rse/features/org.eclipse.rse.core.source/pom.xml
index e0319cae86a..76162bab213 100644
--- a/rse/features/org.eclipse.rse.core.source/pom.xml
+++ b/rse/features/org.eclipse.rse.core.source/pom.xml
@@ -3,14 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.features</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.core.source</artifactId>
-  <version>3.7.3.qualifier</version>
+  <version>3.7.3-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.dstore-feature/pom.xml b/rse/features/org.eclipse.rse.dstore-feature/pom.xml
index a5ed60bd565..a09b8106ef8 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.dstore-feature/pom.xml
@@ -3,14 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.features</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.dstore</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.dstore.source/pom.xml b/rse/features/org.eclipse.rse.dstore.source/pom.xml
index 378d4bf20ab..49dd2a8ff94 100644
--- a/rse/features/org.eclipse.rse.dstore.source/pom.xml
+++ b/rse/features/org.eclipse.rse.dstore.source/pom.xml
@@ -3,14 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.features</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.dstore.source</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.ftp-feature/pom.xml b/rse/features/org.eclipse.rse.ftp-feature/pom.xml
index 3684bd029a0..69599098cf6 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.ftp-feature/pom.xml
@@ -3,14 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.features</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.ftp</artifactId>
-  <version>3.7.1.qualifier</version>
+  <version>3.7.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.ftp.source/pom.xml b/rse/features/org.eclipse.rse.ftp.source/pom.xml
index 736d4df1c0f..802f00fabd9 100644
--- a/rse/features/org.eclipse.rse.ftp.source/pom.xml
+++ b/rse/features/org.eclipse.rse.ftp.source/pom.xml
@@ -3,14 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.features</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.ftp.source</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.local-feature/pom.xml b/rse/features/org.eclipse.rse.local-feature/pom.xml
index 46e64cf6bc9..e3a8a47b8bd 100644
--- a/rse/features/org.eclipse.rse.local-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.local-feature/pom.xml
@@ -3,14 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.features</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.local</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.local.source/pom.xml b/rse/features/org.eclipse.rse.local.source/pom.xml
index 2e74cdf3d3e..e99bcb48539 100644
--- a/rse/features/org.eclipse.rse.local.source/pom.xml
+++ b/rse/features/org.eclipse.rse.local.source/pom.xml
@@ -3,14 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.features</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.local.source</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.scp-feature/feature.xml b/rse/features/org.eclipse.rse.scp-feature/feature.xml
index 6e61aeca30a..d0b5f9650a2 100644
--- a/rse/features/org.eclipse.rse.scp-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.scp-feature/feature.xml
@@ -55,12 +55,12 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
+ <!--
    <plugin
          id="org.eclipse.rse.subsystems.files.scp.source"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
+-->
 </feature>
diff --git a/rse/features/org.eclipse.rse.scp-feature/pom.xml b/rse/features/org.eclipse.rse.scp-feature/pom.xml
index 09b83b7e2fa..d26e8e2e36b 100644
--- a/rse/features/org.eclipse.rse.scp-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.scp-feature/pom.xml
@@ -3,14 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.features</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.scp</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.sdk-feature/feature.xml b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
index e46504ccace..9f1e2251c25 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
@@ -39,30 +39,6 @@
          id="org.eclipse.rse"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.rse.core.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.dstore.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.ftp.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.local.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.ssh.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.telnet.source"
-         version="0.0.0"/>
-
    <plugin
          id="org.eclipse.rse.sdk"
          download-size="7"
diff --git a/rse/features/org.eclipse.rse.sdk-feature/pom.xml b/rse/features/org.eclipse.rse.sdk-feature/pom.xml
index 4a273e4fd51..ba287211b6c 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.sdk-feature/pom.xml
@@ -3,14 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.features</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.sdk</artifactId>
-  <version>3.7.3.qualifier</version>
+  <version>3.7.3-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.ssh-feature/pom.xml b/rse/features/org.eclipse.rse.ssh-feature/pom.xml
index d56d949e428..684029aef0e 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.ssh-feature/pom.xml
@@ -3,14 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.features</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.ssh</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.ssh.source/pom.xml b/rse/features/org.eclipse.rse.ssh.source/pom.xml
index 7dd96b0ab17..8f4402a11f2 100644
--- a/rse/features/org.eclipse.rse.ssh.source/pom.xml
+++ b/rse/features/org.eclipse.rse.ssh.source/pom.xml
@@ -3,14 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.features</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.ssh.source</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.telnet-feature/pom.xml b/rse/features/org.eclipse.rse.telnet-feature/pom.xml
index b0897dff7bd..21147aee98f 100644
--- a/rse/features/org.eclipse.rse.telnet-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.telnet-feature/pom.xml
@@ -3,14 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.features</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.telnet</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.telnet.source/pom.xml b/rse/features/org.eclipse.rse.telnet.source/pom.xml
index ae17f0a8118..a31aef75a93 100644
--- a/rse/features/org.eclipse.rse.telnet.source/pom.xml
+++ b/rse/features/org.eclipse.rse.telnet.source/pom.xml
@@ -3,14 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.features</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.telnet.source</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.terminals-feature/pom.xml b/rse/features/org.eclipse.rse.terminals-feature/pom.xml
index 17544d92db1..6efd79bc20f 100644
--- a/rse/features/org.eclipse.rse.terminals-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.terminals-feature/pom.xml
@@ -3,14 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.features</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.terminals</artifactId>
-  <version>3.8.0.qualifier</version>
+  <version>3.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.terminals.source/pom.xml b/rse/features/org.eclipse.rse.terminals.source/pom.xml
index ed6b50c12ef..aa34071c788 100644
--- a/rse/features/org.eclipse.rse.terminals.source/pom.xml
+++ b/rse/features/org.eclipse.rse.terminals.source/pom.xml
@@ -3,14 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.features</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.terminals.source</artifactId>
-  <version>3.8.0.qualifier</version>
+  <version>3.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.useractions-feature/pom.xml b/rse/features/org.eclipse.rse.useractions-feature/pom.xml
index b81da077d8a..fc6ef4704a7 100644
--- a/rse/features/org.eclipse.rse.useractions-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.useractions-feature/pom.xml
@@ -3,14 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.features</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.useractions</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/org.eclipse.rse.useractions.sdk-feature/feature.xml b/rse/features/org.eclipse.rse.useractions.sdk-feature/feature.xml
index 4d8a4abb3c1..6dff4256a0f 100644
--- a/rse/features/org.eclipse.rse.useractions.sdk-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.useractions.sdk-feature/feature.xml
@@ -39,10 +39,6 @@
          id="org.eclipse.rse.useractions"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.rse.useractions.source"
-         version="0.0.0"/>
-
    <plugin
          id="org.eclipse.rse.useractions.sdk"
          download-size="7"
diff --git a/rse/features/org.eclipse.rse.useractions.sdk-feature/pom.xml b/rse/features/org.eclipse.rse.useractions.sdk-feature/pom.xml
index 5cdf73bce78..8ab0e1dadf5 100644
--- a/rse/features/org.eclipse.rse.useractions.sdk-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.useractions.sdk-feature/pom.xml
@@ -3,14 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.features</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.useractions.sdk</artifactId>
-  <version>3.7.0.qualifier</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/rse/features/pom.xml b/rse/features/pom.xml
new file mode 100644
index 00000000000..a2ebdb6c47c
--- /dev/null
+++ b/rse/features/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2017 Eclipse Foundation and others.
+  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) - initial implementation
+    Rob Stryker (Red Hat) - 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.tm.rse</groupId>
+    <artifactId>org.eclipse.tm.rse</artifactId>
+    <version>3.6.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.eclipse.tm.rse</groupId>
+  <artifactId>org.eclipse.tm.rse.features</artifactId>
+  <version>3.6.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>org.eclipse.rse.core-feature</module>
+    <module>org.eclipse.rse.dstore-feature</module>
+    <module>org.eclipse.rse-feature</module>
+    <module>org.eclipse.rse.ftp-feature</module>
+    <module>org.eclipse.rse.local-feature</module>
+    <module>org.eclipse.rse.scp-feature</module>
+    <module>org.eclipse.rse.sdk-feature</module>
+    <module>org.eclipse.rse.ssh-feature</module>
+    <module>org.eclipse.rse.telnet-feature</module>
+    <module>org.eclipse.rse.terminals-feature</module>
+    <module>org.eclipse.rse.useractions-feature</module>
+    <module>org.eclipse.rse.useractions.sdk-feature</module>
+  </modules>
+</project>
diff --git a/rse/plugins/org.eclipse.dstore.core/dstore_core.jar b/rse/plugins/org.eclipse.dstore.core/dstore_core.jar
index 518a0d67bbf..da6e419dc27 100644
Binary files a/rse/plugins/org.eclipse.dstore.core/dstore_core.jar and b/rse/plugins/org.eclipse.dstore.core/dstore_core.jar differ
diff --git a/rse/plugins/org.eclipse.dstore.core/pom.xml b/rse/plugins/org.eclipse.dstore.core/pom.xml
index 908d9ec9921..c6e51809f79 100644
--- a/rse/plugins/org.eclipse.dstore.core/pom.xml
+++ b/rse/plugins/org.eclipse.dstore.core/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.dstore.core</artifactId>
diff --git a/rse/plugins/org.eclipse.dstore.extra/pom.xml b/rse/plugins/org.eclipse.dstore.extra/pom.xml
index d5583ad8003..0433c7f8d18 100644
--- a/rse/plugins/org.eclipse.dstore.extra/pom.xml
+++ b/rse/plugins/org.eclipse.dstore.extra/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.dstore.extra</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/pom.xml b/rse/plugins/org.eclipse.rse.connectorservice.dstore/pom.xml
index 92db72757f7..8a80a848535 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/pom.xml
+++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.connectorservice.dstore</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/pom.xml b/rse/plugins/org.eclipse.rse.connectorservice.local/pom.xml
index 82382e1e417..84fb83a289d 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.local/pom.xml
+++ b/rse/plugins/org.eclipse.rse.connectorservice.local/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.connectorservice.local</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/pom.xml b/rse/plugins/org.eclipse.rse.connectorservice.ssh/pom.xml
index 180f1944ac5..34168c050f8 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/pom.xml
+++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.connectorservice.ssh</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.telnet/pom.xml b/rse/plugins/org.eclipse.rse.connectorservice.telnet/pom.xml
index ca5e9a89b48..ad5ecb8c0ac 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.telnet/pom.xml
+++ b/rse/plugins/org.eclipse.rse.connectorservice.telnet/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.connectorservice.telnet</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.core/pom.xml b/rse/plugins/org.eclipse.rse.core/pom.xml
index e24bab905e7..777810209ea 100644
--- a/rse/plugins/org.eclipse.rse.core/pom.xml
+++ b/rse/plugins/org.eclipse.rse.core/pom.xml
@@ -3,13 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.core</artifactId>
-  <version>3.3.100.qualifier</version>
+  <version>3.3.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/rse/plugins/org.eclipse.rse.dstore.security/pom.xml b/rse/plugins/org.eclipse.rse.dstore.security/pom.xml
index c79fb7a5af5..e84e7296f43 100644
--- a/rse/plugins/org.eclipse.rse.dstore.security/pom.xml
+++ b/rse/plugins/org.eclipse.rse.dstore.security/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.dstore.security</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.efs.ui/pom.xml b/rse/plugins/org.eclipse.rse.efs.ui/pom.xml
index ba7c7c3ec73..a1cefbc3977 100644
--- a/rse/plugins/org.eclipse.rse.efs.ui/pom.xml
+++ b/rse/plugins/org.eclipse.rse.efs.ui/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.efs.ui</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.efs/pom.xml b/rse/plugins/org.eclipse.rse.efs/pom.xml
index 5f91969307f..a323a4ba67f 100644
--- a/rse/plugins/org.eclipse.rse.efs/pom.xml
+++ b/rse/plugins/org.eclipse.rse.efs/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.efs</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.files.ui/pom.xml b/rse/plugins/org.eclipse.rse.files.ui/pom.xml
index eb9a41292bb..10874e86483 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/pom.xml
+++ b/rse/plugins/org.eclipse.rse.files.ui/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.files.ui</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.importexport/pom.xml b/rse/plugins/org.eclipse.rse.importexport/pom.xml
index 04790285965..a68eb062543 100644
--- a/rse/plugins/org.eclipse.rse.importexport/pom.xml
+++ b/rse/plugins/org.eclipse.rse.importexport/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.importexport</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.processes.ui/pom.xml b/rse/plugins/org.eclipse.rse.processes.ui/pom.xml
index 7cd6466f840..a2473a26488 100644
--- a/rse/plugins/org.eclipse.rse.processes.ui/pom.xml
+++ b/rse/plugins/org.eclipse.rse.processes.ui/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.processes.ui</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.sdk/pom.xml b/rse/plugins/org.eclipse.rse.sdk/pom.xml
index 179203f9768..4c63ae8ceba 100644
--- a/rse/plugins/org.eclipse.rse.sdk/pom.xml
+++ b/rse/plugins/org.eclipse.rse.sdk/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.sdk</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/pom.xml b/rse/plugins/org.eclipse.rse.services.dstore/pom.xml
index a8d0ff48b2e..e0fd8e1a12e 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/pom.xml
+++ b/rse/plugins/org.eclipse.rse.services.dstore/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.services.dstore</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/pom.xml b/rse/plugins/org.eclipse.rse.services.files.ftp/pom.xml
index 6aa6f115972..17fd5ad6fac 100644
--- a/rse/plugins/org.eclipse.rse.services.files.ftp/pom.xml
+++ b/rse/plugins/org.eclipse.rse.services.files.ftp/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.services.files.ftp</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.services.local/pom.xml b/rse/plugins/org.eclipse.rse.services.local/pom.xml
index b939ab6e9d1..66c9272c34a 100644
--- a/rse/plugins/org.eclipse.rse.services.local/pom.xml
+++ b/rse/plugins/org.eclipse.rse.services.local/pom.xml
@@ -3,13 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
    </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.services.local</artifactId>
-  <version>2.2.1.qualifier</version>
+  <version>2.2.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/rse/plugins/org.eclipse.rse.services.ssh/pom.xml b/rse/plugins/org.eclipse.rse.services.ssh/pom.xml
index ccd4039034e..026a9cbd3a6 100644
--- a/rse/plugins/org.eclipse.rse.services.ssh/pom.xml
+++ b/rse/plugins/org.eclipse.rse.services.ssh/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.services.ssh</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.services.telnet/pom.xml b/rse/plugins/org.eclipse.rse.services.telnet/pom.xml
index f7a565e3f0e..d1d08be9afa 100644
--- a/rse/plugins/org.eclipse.rse.services.telnet/pom.xml
+++ b/rse/plugins/org.eclipse.rse.services.telnet/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.services.telnet</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.services/pom.xml b/rse/plugins/org.eclipse.rse.services/pom.xml
index fd3ba0abfc1..2cc053f508d 100644
--- a/rse/plugins/org.eclipse.rse.services/pom.xml
+++ b/rse/plugins/org.eclipse.rse.services/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.services</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.shells.ui/pom.xml b/rse/plugins/org.eclipse.rse.shells.ui/pom.xml
index d4b3cfa4798..f246153a432 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/pom.xml
+++ b/rse/plugins/org.eclipse.rse.shells.ui/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.shells.ui</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/pom.xml b/rse/plugins/org.eclipse.rse.subsystems.files.core/pom.xml
index 1c92506f205..0fbfc52e27f 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/pom.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.subsystems.files.core</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/pom.xml b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/pom.xml
index a22fe7252b3..7e8881d8a8d 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/pom.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.subsystems.files.dstore</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/pom.xml b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/pom.xml
index 01ad04e3bb2..5369ec5c44c 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/pom.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.subsystems.files.ftp</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/pom.xml b/rse/plugins/org.eclipse.rse.subsystems.files.local/pom.xml
index 888701446ca..12a7af70d6b 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.local/pom.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.subsystems.files.local</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.scp/pom.xml b/rse/plugins/org.eclipse.rse.subsystems.files.scp/pom.xml
index 3fc3cd3b1fe..713e27d0c77 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.scp/pom.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.scp/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.subsystems.files.scp</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/pom.xml b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/pom.xml
index 0a26ec5f401..dd308a246f2 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/pom.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.subsystems.files.ssh</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/pom.xml b/rse/plugins/org.eclipse.rse.subsystems.processes.core/pom.xml
index f36050abab9..e933331ec78 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/pom.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.subsystems.processes.core</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/pom.xml b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/pom.xml
index 413682d60a6..5017d240adf 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/pom.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.subsystems.processes.dstore</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.local/pom.xml b/rse/plugins/org.eclipse.rse.subsystems.processes.local/pom.xml
index 90c00a9cd84..b1330177388 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.local/pom.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.local/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.subsystems.processes.local</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux/pom.xml b/rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux/pom.xml
index 91655b6ac7c..68db4b8d71c 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux/pom.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.subsystems.processes.shell.linux</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/pom.xml b/rse/plugins/org.eclipse.rse.subsystems.shells.core/pom.xml
index 71650bd57d1..df9604621ee 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/pom.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.subsystems.shells.core</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/pom.xml b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/pom.xml
index 772df6b8db8..7b804c06f31 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/pom.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.subsystems.shells.dstore</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/pom.xml b/rse/plugins/org.eclipse.rse.subsystems.shells.local/pom.xml
index 64e62bc3073..084be40305b 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/pom.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.subsystems.shells.local</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/pom.xml b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/pom.xml
index 947169a61bb..e27afc12ce1 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/pom.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.subsystems.shells.ssh</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/pom.xml b/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/pom.xml
index ed77b6b68d0..6b68c7d742e 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/pom.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.subsystems.shells.telnet</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.terminals.core/pom.xml b/rse/plugins/org.eclipse.rse.subsystems.terminals.core/pom.xml
index caa358a8ad1..8e6f3b3529b 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.terminals.core/pom.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.terminals.core/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.subsystems.terminals.core</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.terminals.ssh/pom.xml b/rse/plugins/org.eclipse.rse.subsystems.terminals.ssh/pom.xml
index 40d505705c9..17aac183e61 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.terminals.ssh/pom.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.terminals.ssh/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.subsystems.terminals.ssh</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.terminals.ui/pom.xml b/rse/plugins/org.eclipse.rse.terminals.ui/pom.xml
index 65f19a51c90..a2b331f0070 100644
--- a/rse/plugins/org.eclipse.rse.terminals.ui/pom.xml
+++ b/rse/plugins/org.eclipse.rse.terminals.ui/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.terminals.ui</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.ui.capabilities/pom.xml b/rse/plugins/org.eclipse.rse.ui.capabilities/pom.xml
index 87ba6da4838..46282d4529f 100644
--- a/rse/plugins/org.eclipse.rse.ui.capabilities/pom.xml
+++ b/rse/plugins/org.eclipse.rse.ui.capabilities/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.ui.capabilities</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.ui/pom.xml b/rse/plugins/org.eclipse.rse.ui/pom.xml
index 62ff536f05f..3b862e5ceca 100644
--- a/rse/plugins/org.eclipse.rse.ui/pom.xml
+++ b/rse/plugins/org.eclipse.rse.ui/pom.xml
@@ -3,13 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.ui</artifactId>
-  <version>3.3.400.qualifier</version>
+  <version>3.3.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/rse/plugins/org.eclipse.rse.useractions.sdk/pom.xml b/rse/plugins/org.eclipse.rse.useractions.sdk/pom.xml
index b683b3be570..c5e7cd06921 100644
--- a/rse/plugins/org.eclipse.rse.useractions.sdk/pom.xml
+++ b/rse/plugins/org.eclipse.rse.useractions.sdk/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.useractions.sdk</artifactId>
diff --git a/rse/plugins/org.eclipse.rse.useractions/pom.xml b/rse/plugins/org.eclipse.rse.useractions/pom.xml
index 511622d3504..1dafbd9a293 100644
--- a/rse/plugins/org.eclipse.rse.useractions/pom.xml
+++ b/rse/plugins/org.eclipse.rse.useractions/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.useractions</artifactId>
diff --git a/rse/plugins/org.eclipse.rse/pom.xml b/rse/plugins/org.eclipse.rse/pom.xml
index b24ff489a1b..89558d15d49 100644
--- a/rse/plugins/org.eclipse.rse/pom.xml
+++ b/rse/plugins/org.eclipse.rse/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse</artifactId>
diff --git a/rse/plugins/pom.xml b/rse/plugins/pom.xml
new file mode 100644
index 00000000000..644df79798d
--- /dev/null
+++ b/rse/plugins/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2017 Eclipse Foundation and others.
+  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) - initial implementation
+    Rob Stryker (Red Hat) - 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.tm.rse</groupId>
+    <artifactId>org.eclipse.tm.rse</artifactId>
+    <version>3.6.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.eclipse.tm.rse</groupId>
+  <artifactId>org.eclipse.tm.rse.plugins</artifactId>
+  <version>3.6.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>org.eclipse.dstore.core</module>
+    <module>org.eclipse.dstore.extra</module>
+    <module>org.eclipse.rse</module>
+    <module>org.eclipse.rse.connectorservice.dstore</module>
+    <module>org.eclipse.rse.connectorservice.local</module>
+    <module>org.eclipse.rse.connectorservice.ssh</module>
+    <module>org.eclipse.rse.connectorservice.telnet</module>
+    <module>org.eclipse.rse.core</module>
+    <module>org.eclipse.rse.dstore.security</module>
+    <module>org.eclipse.rse.efs</module>
+    <module>org.eclipse.rse.efs.ui</module>
+    <module>org.eclipse.rse.files.ui</module>
+    <module>org.eclipse.rse.importexport</module>
+    <module>org.eclipse.rse.processes.ui</module>
+    <module>org.eclipse.rse.sdk</module>
+    <module>org.eclipse.rse.services</module>
+    <module>org.eclipse.rse.services.dstore</module>
+    <module>org.eclipse.rse.services.files.ftp</module>
+    <module>org.eclipse.rse.services.local</module>
+    <module>org.eclipse.rse.services.ssh</module>
+    <module>org.eclipse.rse.services.telnet</module>
+    <module>org.eclipse.rse.shells.ui</module>
+    <module>org.eclipse.rse.subsystems.files.core</module>
+    <module>org.eclipse.rse.subsystems.files.dstore</module>
+    <module>org.eclipse.rse.subsystems.files.ftp</module>
+    <module>org.eclipse.rse.subsystems.files.local</module>
+    <module>org.eclipse.rse.subsystems.files.scp</module>
+    <module>org.eclipse.rse.subsystems.files.ssh</module>
+    <module>org.eclipse.rse.subsystems.processes.core</module>
+    <module>org.eclipse.rse.subsystems.processes.dstore</module>
+    <module>org.eclipse.rse.subsystems.processes.local</module>
+    <module>org.eclipse.rse.subsystems.processes.shell.linux</module>
+    <module>org.eclipse.rse.subsystems.shells.core</module>
+    <module>org.eclipse.rse.subsystems.shells.dstore</module>
+    <module>org.eclipse.rse.subsystems.shells.local</module>
+    <module>org.eclipse.rse.subsystems.shells.ssh</module>
+    <module>org.eclipse.rse.subsystems.shells.telnet</module>
+    <module>org.eclipse.rse.subsystems.terminals.core</module>
+    <module>org.eclipse.rse.subsystems.terminals.ssh</module>
+    <module>org.eclipse.rse.terminals.ui</module>
+    <module>org.eclipse.rse.ui</module>
+    <module>org.eclipse.rse.ui.capabilities</module>
+    <module>org.eclipse.rse.useractions</module>
+    <module>org.eclipse.rse.useractions.sdk</module>
+  </modules>
+</project>
diff --git a/rse/pom.xml b/rse/pom.xml
new file mode 100644
index 00000000000..4b5bf6b10c3
--- /dev/null
+++ b/rse/pom.xml
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!--
+  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  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:
+    Thanh Ha (Eclipse Foundation) - initial implementation
+    Nick Boldt (Red Hat Inc.) - support for Tycho 1.0 and upstream component builds
+-->
+<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.0.0-SNAPSHOT</version>
+  </parent>
+
+
+  <groupId>org.eclipse.tm.rse</groupId>
+  <artifactId>org.eclipse.tm.rse</artifactId>
+  <version>3.6.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+   <modules>
+     <module>doc</module>
+     <module>examples</module>
+     <module>features</module>
+     <module>plugins</module>
+     <module>tests</module>
+     <module>site</module>
+    </modules>
+</project>
diff --git a/releng/org.eclipse.tm.repo/category.xml b/rse/site/category.xml
similarity index 88%
rename from releng/org.eclipse.tm.repo/category.xml
rename to rse/site/category.xml
index d7b432067af..9e048a3973a 100644
--- a/releng/org.eclipse.tm.repo/category.xml
+++ b/rse/site/category.xml
@@ -9,9 +9,6 @@
    <feature url="features/org.eclipse.rse.terminals_0.0.0.jar" id="org.eclipse.rse.terminals" version="0.0.0">
       <category name="rse_38_main"/>
    </feature>
-   <feature url="features/org.eclipse.rse.terminals.source_0.0.0.jar" id="org.eclipse.rse.terminals.source" version="0.0.0">
-      <category name="rse_38_main"/>
-   </feature>
    <feature url="features/org.eclipse.rse.useractions_0.0.0.jar" id="org.eclipse.rse.useractions" version="0.0.0">
       <category name="rse_38_main"/>
    </feature>
diff --git a/rse/site/pom.xml b/rse/site/pom.xml
new file mode 100755
index 00000000000..c980a8261b6
--- /dev/null
+++ b/rse/site/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.rse</groupId>
+		<artifactId>org.eclipse.tm.rse</artifactId>
+		<version>3.6.0-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.eclipse.tm.rse</groupId>
+	<artifactId>org.eclipse.tm.rse.site</artifactId>
+	<packaging>eclipse-repository</packaging>
+</project>
diff --git a/rse/tests/org.eclipse.rse.tests-feature/feature.xml b/rse/tests/org.eclipse.rse.tests-feature/feature.xml
index 7142172ffa6..b742f7cc576 100644
--- a/rse/tests/org.eclipse.rse.tests-feature/feature.xml
+++ b/rse/tests/org.eclipse.rse.tests-feature/feature.xml
@@ -80,18 +80,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.rse.tests.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.tests.framework.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/rse/tests/org.eclipse.rse.tests-feature/pom.xml b/rse/tests/org.eclipse.rse.tests-feature/pom.xml
index 4d0d8556117..8f361c59b76 100644
--- a/rse/tests/org.eclipse.rse.tests-feature/pom.xml
+++ b/rse/tests/org.eclipse.rse.tests-feature/pom.xml
@@ -3,13 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.tests</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.tests</artifactId>
-  <version>3.6.100.qualifier</version>
+  <version>3.6.100-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/rse/tests/org.eclipse.rse.tests.framework.examples/pom.xml b/rse/tests/org.eclipse.rse.tests.framework.examples/pom.xml
index 76da1e7d76c..5703f14ac7a 100644
--- a/rse/tests/org.eclipse.rse.tests.framework.examples/pom.xml
+++ b/rse/tests/org.eclipse.rse.tests.framework.examples/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.tests</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.tests.framework.examples</artifactId>
diff --git a/rse/tests/org.eclipse.rse.tests.framework/pom.xml b/rse/tests/org.eclipse.rse.tests.framework/pom.xml
index 6f7cc653f61..12d3fcc48f5 100644
--- a/rse/tests/org.eclipse.rse.tests.framework/pom.xml
+++ b/rse/tests/org.eclipse.rse.tests.framework/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.tests</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.tests.framework</artifactId>
diff --git a/rse/tests/org.eclipse.rse.tests/pom.xml b/rse/tests/org.eclipse.rse.tests/pom.xml
index 8fa8c983ecd..b2e501f8a0f 100644
--- a/rse/tests/org.eclipse.rse.tests/pom.xml
+++ b/rse/tests/org.eclipse.rse.tests/pom.xml
@@ -3,14 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
-    <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../../admin/pom-build.xml</relativePath>
+    <artifactId>org.eclipse.tm.rse.tests</artifactId>
+    <groupId>org.eclipse.tm.rse</groupId>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.tests</artifactId>
-  <version>3.4.100.qualifier</version>
+  <version>3.4.100-SNAPSHOT</version>
   <!--  <packaging>eclipse-plugin</packaging> -->
   <packaging>eclipse-test-plugin</packaging>
   	<build>
diff --git a/rse/tests/pom.xml b/rse/tests/pom.xml
new file mode 100644
index 00000000000..ea142d42b4b
--- /dev/null
+++ b/rse/tests/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2017 Eclipse Foundation and others.
+  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) - initial implementation
+    Rob Stryker (Red Hat) - 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.tm.rse</groupId>
+    <artifactId>org.eclipse.tm.rse</artifactId>
+    <version>3.6.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.eclipse.tm.rse</groupId>
+  <artifactId>org.eclipse.tm.rse.tests</artifactId>
+  <version>3.6.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>org.eclipse.rse.tests</module>
+    <module>org.eclipse.rse.tests-feature</module>
+    <module>org.eclipse.rse.tests.framework</module>
+    <module>org.eclipse.rse.tests.framework.examples</module>
+  </modules>
+</project>
diff --git a/rse/tools/pom.xml b/rse/tools/pom.xml
new file mode 100644
index 00000000000..3db79072318
--- /dev/null
+++ b/rse/tools/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2017 Eclipse Foundation and others.
+  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) - initial implementation
+    Rob Stryker (Red Hat) - 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.tm.rse</groupId>
+    <artifactId>org.eclipse.tm.rse</artifactId>
+    <version>3.6.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.eclipse.tm.rse</groupId>
+  <artifactId>org.eclipse.tm.rse.tools</artifactId>
+  <version>3.6.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>org.eclipse.rse.tools.workspace</module>
+  </modules>
+</project>
diff --git a/wince/org.eclipse.rse.subsystems.wince/pom.xml b/wince/org.eclipse.rse.subsystems.wince/pom.xml
index da407a23d85..e997576d98c 100644
--- a/wince/org.eclipse.rse.subsystems.wince/pom.xml
+++ b/wince/org.eclipse.rse.subsystems.wince/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
+    <artifactId>org.eclipse.tm.wince</artifactId>
+    <groupId>org.eclipse.tm.wince</groupId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.subsystems.wince</artifactId>
diff --git a/wince/org.eclipse.rse.wince-feature/feature.xml b/wince/org.eclipse.rse.wince-feature/feature.xml
index 27b5ad48da8..0dbd841d190 100644
--- a/wince/org.eclipse.rse.wince-feature/feature.xml
+++ b/wince/org.eclipse.rse.wince-feature/feature.xml
@@ -59,7 +59,7 @@
          install-size="26"
          version="0.0.0"
          unpack="false"/>
-
+ <!--
    <plugin
          id="org.eclipse.rse.subsystems.wince.source"
          download-size="0"
@@ -73,5 +73,5 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
+-->
 </feature>
diff --git a/wince/org.eclipse.rse.wince-feature/pom.xml b/wince/org.eclipse.rse.wince-feature/pom.xml
index 22bbf166cb8..3273f609e8c 100644
--- a/wince/org.eclipse.rse.wince-feature/pom.xml
+++ b/wince/org.eclipse.rse.wince-feature/pom.xml
@@ -3,14 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
+    <artifactId>org.eclipse.tm.wince</artifactId>
+    <groupId>org.eclipse.tm.wince</groupId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.wince</artifactId>
-  <version>4.0.0.qualifier</version>
+  <version>4.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   <build>
           <plugins>
diff --git a/wince/org.eclipse.tm.rapi/pom.xml b/wince/org.eclipse.tm.rapi/pom.xml
index 7f1cfd4cae7..5efa96ae2b2 100644
--- a/wince/org.eclipse.tm.rapi/pom.xml
+++ b/wince/org.eclipse.tm.rapi/pom.xml
@@ -3,10 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>org.eclipse.tm.maven-build</artifactId>
-    <groupId>org.eclipse.tm</groupId>
+    <artifactId>org.eclipse.tm.wince</artifactId>
+    <groupId>org.eclipse.tm.wince</groupId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../admin/pom-build.xml</relativePath>
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.tm.rapi</artifactId>
diff --git a/wince/pom.xml b/wince/pom.xml
new file mode 100644
index 00000000000..d6c13156c9c
--- /dev/null
+++ b/wince/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2017 Eclipse Foundation and others.
+  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) - initial implementation
+    Rob Stryker (Red Hat) - 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.tm</groupId>
+    <artifactId>tm-parent</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.eclipse.tm.wince</groupId>
+  <artifactId>org.eclipse.tm.wince</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>org.eclipse.rse.wince-feature</module>
+    <module>org.eclipse.rse.subsystems.wince</module>
+    <module>org.eclipse.tm.rapi</module>
+  </modules>
+</project>