refinement[ats_3N6F1]: Create ATS maven module

Change-Id: I54a29a8a32bf61028482305af2f3849f822b0fad

93 files changed, 271 insertions, 168 deletions

diff --git a/features/org.eclipse.osee.demo.feature/.project b/features/org.eclipse.osee.ats.client.demo.feature.source/.project
index 6244a4984f3..0640a579709 100644
--- a/features/org.eclipse.osee.demo.feature/.project
+++ b/features/org.eclipse.osee.ats.client.demo.feature.source/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.osee.demo.feature</name>
+	<name>org.eclipse.osee.ats.client.demo.feature.source</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/features/org.eclipse.osee.demo.feature.source/build.properties b/features/org.eclipse.osee.ats.client.demo.feature.source/build.properties
index 2cbd854200f..2cbd854200f 100644
--- a/features/org.eclipse.osee.demo.feature.source/build.properties
+++ b/features/org.eclipse.osee.ats.client.demo.feature.source/build.properties
diff --git a/features/org.eclipse.osee.demo.feature.source/sourceTemplateFeature/feature.properties b/features/org.eclipse.osee.ats.client.demo.feature.source/feature.properties
index 6631995f94d..68d72d4a803 100644
--- a/features/org.eclipse.osee.demo.feature.source/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.osee.ats.client.demo.feature.source/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse OSEE Demo Feature Source (Incubation)
+featureName=Eclipse OSEE ATS Client Demo Feature Source (Incubation)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
diff --git a/features/org.eclipse.osee.demo.feature.source/feature.xml b/features/org.eclipse.osee.ats.client.demo.feature.source/feature.xml
index dc19b1167bd..a87a6094564 100644
--- a/features/org.eclipse.osee.demo.feature.source/feature.xml
+++ b/features/org.eclipse.osee.ats.client.demo.feature.source/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.eclipse.osee.demo.feature.source"
+      id="org.eclipse.osee.ats.client.demo.feature.source"
       label="%featureName"
       version="0.11.0.qualifier"
       provider-name="%providerName">
@@ -18,7 +18,7 @@
    </license>
 
    <plugin
-         id="org.eclipse.osee.ats.config.demo.source"
+         id="org.eclipse.osee.ats.client.demo.source"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/features/org.eclipse.osee.demo.feature.source/license.html b/features/org.eclipse.osee.ats.client.demo.feature.source/license.html
index c6af966b61e..c6af966b61e 100644
--- a/features/org.eclipse.osee.demo.feature.source/license.html
+++ b/features/org.eclipse.osee.ats.client.demo.feature.source/license.html
diff --git a/features/org.eclipse.osee.demo.feature.source/pom.xml b/features/org.eclipse.osee.ats.client.demo.feature.source/pom.xml
index 59e57dd83a1..a20af136bd8 100644
--- a/features/org.eclipse.osee.demo.feature.source/pom.xml
+++ b/features/org.eclipse.osee.ats.client.demo.feature.source/pom.xml
@@ -5,13 +5,13 @@
 
 	<parent>
 		<groupId>org.eclipse.osee</groupId>
-		<artifactId>org.eclipse.osee.client.parent</artifactId>
+		<artifactId>org.eclipse.osee.ats.parent</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../../plugins/org.eclipse.osee.client.parent</relativePath>
+		<relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath>
 	</parent>
 
-	<artifactId>org.eclipse.osee.demo.feature.source</artifactId>
+	<artifactId>org.eclipse.osee.ats.client.demo.feature.source</artifactId>
 	<packaging>eclipse-feature</packaging>
-	<name>OSEE Demo Feature - Source (Incubation)</name>
+	<name>OSEE ATS Client Demo Feature - Source (Incubation)</name>
 
 </project>
\ No newline at end of file
diff --git a/features/org.eclipse.osee.demo.feature.source/feature.properties b/features/org.eclipse.osee.ats.client.demo.feature.source/sourceTemplateFeature/feature.properties
index 6631995f94d..68d72d4a803 100644
--- a/features/org.eclipse.osee.demo.feature.source/feature.properties
+++ b/features/org.eclipse.osee.ats.client.demo.feature.source/sourceTemplateFeature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse OSEE Demo Feature Source (Incubation)
+featureName=Eclipse OSEE ATS Client Demo Feature Source (Incubation)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
diff --git a/features/org.eclipse.osee.demo.feature.source/sourceTemplateFeature/license.html b/features/org.eclipse.osee.ats.client.demo.feature.source/sourceTemplateFeature/license.html
index c6af966b61e..c6af966b61e 100644
--- a/features/org.eclipse.osee.demo.feature.source/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.osee.ats.client.demo.feature.source/sourceTemplateFeature/license.html
diff --git a/features/org.eclipse.osee.demo.feature/.pmd b/features/org.eclipse.osee.ats.client.demo.feature/.pmd
index c7b0a9fb3f5..c7b0a9fb3f5 100644
--- a/features/org.eclipse.osee.demo.feature/.pmd
+++ b/features/org.eclipse.osee.ats.client.demo.feature/.pmd
diff --git a/features/org.eclipse.osee.demo.feature.source/.project b/features/org.eclipse.osee.ats.client.demo.feature/.project
index f177b931f63..021d9f92ef9 100644
--- a/features/org.eclipse.osee.demo.feature.source/.project
+++ b/features/org.eclipse.osee.ats.client.demo.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.osee.demo.feature.source</name>
+	<name>org.eclipse.osee.ats.client.demo.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/features/org.eclipse.osee.demo.feature/build.properties b/features/org.eclipse.osee.ats.client.demo.feature/build.properties
index 2cbd854200f..2cbd854200f 100644
--- a/features/org.eclipse.osee.demo.feature/build.properties
+++ b/features/org.eclipse.osee.ats.client.demo.feature/build.properties
diff --git a/features/org.eclipse.osee.demo.feature/feature.properties b/features/org.eclipse.osee.ats.client.demo.feature/feature.properties
index bb1e2e3a7d0..026b3bf9bff 100644
--- a/features/org.eclipse.osee.demo.feature/feature.properties
+++ b/features/org.eclipse.osee.ats.client.demo.feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse OSEE Demo Feature (Incubation)
+featureName=Eclipse OSEE ATS Client Demo Feature (Incubation)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
diff --git a/features/org.eclipse.osee.demo.feature/feature.xml b/features/org.eclipse.osee.ats.client.demo.feature/feature.xml
index 9abb0b32c23..a8f9114a58b 100644
--- a/features/org.eclipse.osee.demo.feature/feature.xml
+++ b/features/org.eclipse.osee.ats.client.demo.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.eclipse.osee.demo.feature"
+      id="org.eclipse.osee.ats.client.demo.feature"
       label="%featureName"
       version="0.11.0.qualifier"
       provider-name="%providerName">
@@ -18,7 +18,7 @@
    </license>
 
    <plugin
-         id="org.eclipse.osee.ats.config.demo"
+         id="org.eclipse.osee.ats.client.demo"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/features/org.eclipse.osee.demo.feature/license.html b/features/org.eclipse.osee.ats.client.demo.feature/license.html
index c6af966b61e..c6af966b61e 100644
--- a/features/org.eclipse.osee.demo.feature/license.html
+++ b/features/org.eclipse.osee.ats.client.demo.feature/license.html
diff --git a/features/org.eclipse.osee.demo.feature/pom.xml b/features/org.eclipse.osee.ats.client.demo.feature/pom.xml
index 8a96dbe9938..f50e723a8da 100644
--- a/features/org.eclipse.osee.demo.feature/pom.xml
+++ b/features/org.eclipse.osee.ats.client.demo.feature/pom.xml
@@ -5,13 +5,13 @@
 
 	<parent>
 		<groupId>org.eclipse.osee</groupId>
-		<artifactId>org.eclipse.osee.client.parent</artifactId>
+		<artifactId>org.eclipse.osee.ats.parent</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../../plugins/org.eclipse.osee.client.parent</relativePath>
+		<relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath>
 	</parent>
 
-	<artifactId>org.eclipse.osee.demo.feature</artifactId>
+	<artifactId>org.eclipse.osee.ats.client.demo.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
-	<name>OSEE Demo Feature (Incubation)</name>
+	<name>OSEE ATS Client Demo Feature (Incubation)</name>
 
 </project>
\ No newline at end of file
diff --git a/features/org.eclipse.osee.demo.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.osee.ats.client.demo.feature/sourceTemplateFeature/feature.properties
index 6631995f94d..68d72d4a803 100644
--- a/features/org.eclipse.osee.demo.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.osee.ats.client.demo.feature/sourceTemplateFeature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse OSEE Demo Feature Source (Incubation)
+featureName=Eclipse OSEE ATS Client Demo Feature Source (Incubation)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
diff --git a/features/org.eclipse.osee.demo.feature/sourceTemplateFeature/license.html b/features/org.eclipse.osee.ats.client.demo.feature/sourceTemplateFeature/license.html
index c6af966b61e..c6af966b61e 100644
--- a/features/org.eclipse.osee.demo.feature/sourceTemplateFeature/license.html
+++ b/features/org.eclipse.osee.ats.client.demo.feature/sourceTemplateFeature/license.html
diff --git a/features/org.eclipse.osee.ats.feature.source/pom.xml b/features/org.eclipse.osee.ats.feature.source/pom.xml
index 4e63a4d9864..30ef9e09e40 100644
--- a/features/org.eclipse.osee.ats.feature.source/pom.xml
+++ b/features/org.eclipse.osee.ats.feature.source/pom.xml
@@ -5,9 +5,9 @@
 
 	<parent>
 		<groupId>org.eclipse.osee</groupId>
-		<artifactId>org.eclipse.osee.client.parent</artifactId>
+		<artifactId>org.eclipse.osee.ats.parent</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../../plugins/org.eclipse.osee.client.parent</relativePath>
+		<relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.osee.ats.feature.source</artifactId>
diff --git a/features/org.eclipse.osee.ats.feature/pom.xml b/features/org.eclipse.osee.ats.feature/pom.xml
index 7f3ba92e29b..7a3782d9844 100644
--- a/features/org.eclipse.osee.ats.feature/pom.xml
+++ b/features/org.eclipse.osee.ats.feature/pom.xml
@@ -5,9 +5,9 @@
 
 	<parent>
 		<groupId>org.eclipse.osee</groupId>
-		<artifactId>org.eclipse.osee.client.parent</artifactId>
+		<artifactId>org.eclipse.osee.ats.parent</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../../plugins/org.eclipse.osee.client.parent</relativePath>
+		<relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.osee.ats.feature</artifactId>
diff --git a/features/org.eclipse.osee.client.all.feature.source/feature.xml b/features/org.eclipse.osee.client.all.feature.source/feature.xml
index c00ed22dfc1..b07dae5dc48 100644
--- a/features/org.eclipse.osee.client.all.feature.source/feature.xml
+++ b/features/org.eclipse.osee.client.all.feature.source/feature.xml
@@ -33,4 +33,12 @@
          id="org.eclipse.osee.coverage.feature.source"
          version="0.0.0"/>
          
+   <includes
+         id="org.eclipse.osee.ats.feature.source"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.osee.ats.client.demo.feature.source"
+         version="0.0.0"/>
+
 </feature>
diff --git a/features/org.eclipse.osee.client.all.feature/feature.xml b/features/org.eclipse.osee.client.all.feature/feature.xml
index 88b0452e74e..278d28d5910 100644
--- a/features/org.eclipse.osee.client.all.feature/feature.xml
+++ b/features/org.eclipse.osee.client.all.feature/feature.xml
@@ -33,4 +33,12 @@
          id="org.eclipse.osee.coverage.feature"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.osee.ats.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.osee.ats.client.demo.feature"
+         version="0.0.0"/>
+
 </feature>
diff --git a/features/org.eclipse.osee.client.feature.source/feature.xml b/features/org.eclipse.osee.client.feature.source/feature.xml
index ea9c913c401..b9230992974 100644
--- a/features/org.eclipse.osee.client.feature.source/feature.xml
+++ b/features/org.eclipse.osee.client.feature.source/feature.xml
@@ -29,12 +29,4 @@
          id="org.eclipse.osee.define.feature.source"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.osee.client.demo.feature.source"
-         version="0.0.0"/>
-
-   <requires>
-      <import feature="org.eclipse.osee.core.runtime.feature.source"/>
-   </requires>
-
 </feature>
diff --git a/features/org.eclipse.osee.client.feature/feature.xml b/features/org.eclipse.osee.client.feature/feature.xml
index 700a09f1d6c..a9fd011d6b5 100644
--- a/features/org.eclipse.osee.client.feature/feature.xml
+++ b/features/org.eclipse.osee.client.feature/feature.xml
@@ -29,12 +29,4 @@
          id="org.eclipse.osee.define.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.osee.client.demo.feature"
-         version="0.0.0"/>
-
-   <requires>
-      <import feature="org.eclipse.osee.core.runtime.feature"/>
-   </requires>
-
 </feature>
diff --git a/plugins/org.eclipse.osee.ats.config.demo.test/.classpath b/plugins/org.eclipse.osee.ats.client.demo.test/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/plugins/org.eclipse.osee.ats.config.demo.test/.classpath
+++ b/plugins/org.eclipse.osee.ats.client.demo.test/.classpath
diff --git a/plugins/org.eclipse.osee.ats.config.demo.test/.project b/plugins/org.eclipse.osee.ats.client.demo.test/.project
index ebb4ba08892..6ac49e75033 100644
--- a/plugins/org.eclipse.osee.ats.config.demo.test/.project
+++ b/plugins/org.eclipse.osee.ats.client.demo.test/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.osee.ats.config.demo.test</name>
+	<name>org.eclipse.osee.ats.client.demo.test</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/org.eclipse.osee.ats.config.demo.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.client.demo.test/META-INF/MANIFEST.MF
index ed5cc487168..939b3ed9f03 100644
--- a/plugins/org.eclipse.osee.ats.config.demo.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.client.demo.test/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ATS Config Demo Test Fragment
-Bundle-SymbolicName: org.eclipse.osee.ats.config.demo.test;singleton:=true
+Bundle-SymbolicName: org.eclipse.osee.ats.client.demo.test;singleton:=true
 Bundle-Version: 0.11.0.qualifier
 Bundle-Vendor: Eclipse Open System Engineering Environment
-Fragment-Host: org.eclipse.osee.ats.config.demo
+Fragment-Host: org.eclipse.osee.ats.client.demo
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.osee.ats.config.demo,
- org.eclipse.osee.ats.config.demo.config
+Export-Package: org.eclipse.osee.ats.client.demo,
+ org.eclipse.osee.ats.client.demo.config
 Require-Bundle: org.junit
 Import-Package: org.eclipse.osee.ats.api.data,
  org.eclipse.osee.ats.core.client.action,
diff --git a/plugins/org.eclipse.osee.ats.config.demo.test/build.properties b/plugins/org.eclipse.osee.ats.client.demo.test/build.properties
index 34d2e4d2dad..34d2e4d2dad 100644
--- a/plugins/org.eclipse.osee.ats.config.demo.test/build.properties
+++ b/plugins/org.eclipse.osee.ats.client.demo.test/build.properties
diff --git a/plugins/org.eclipse.osee.ats.config.demo.test/src/org/eclipse/osee/ats/config/demo/PopulateDemoActionsTest.java b/plugins/org.eclipse.osee.ats.client.demo.test/src/org/eclipse/osee/ats/client/demo/PopulateDemoActionsTest.java
index ef6d69eed97..710fb81cb80 100644
--- a/plugins/org.eclipse.osee.ats.config.demo.test/src/org/eclipse/osee/ats/config/demo/PopulateDemoActionsTest.java
+++ b/plugins/org.eclipse.osee.ats.client.demo.test/src/org/eclipse/osee/ats/client/demo/PopulateDemoActionsTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo;
+package org.eclipse.osee.ats.client.demo;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -17,7 +17,7 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
 import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
 import org.eclipse.osee.ats.api.team.IAtsTeamDefinition;
 import org.eclipse.osee.ats.api.version.IAtsVersion;
-import org.eclipse.osee.ats.config.demo.config.DemoDbUtil;
+import org.eclipse.osee.ats.client.demo.config.DemoDbUtil;
 import org.eclipse.osee.ats.core.client.action.ActionArtifact;
 import org.eclipse.osee.ats.core.client.config.AtsBulkLoad;
 import org.eclipse.osee.ats.core.client.review.AbstractReviewArtifact;
diff --git a/plugins/org.eclipse.osee.ats.config.demo.test/src/org/eclipse/osee/ats/config/demo/config/DemoDatabaseConfigTest.java b/plugins/org.eclipse.osee.ats.client.demo.test/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfigTest.java
index d599eabd165..52376649125 100644
--- a/plugins/org.eclipse.osee.ats.config.demo.test/src/org/eclipse/osee/ats/config/demo/config/DemoDatabaseConfigTest.java
+++ b/plugins/org.eclipse.osee.ats.client.demo.test/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfigTest.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.config;
+package org.eclipse.osee.ats.client.demo.config;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import org.eclipse.osee.ats.config.demo.DemoCISBuilds;
+import org.eclipse.osee.ats.client.demo.DemoCISBuilds;
 import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.model.Branch;
diff --git a/plugins/org.eclipse.osee.ats.config.demo.test/src/org/eclipse/osee/ats/config/demo/config/DemoDbGroupsTest.java b/plugins/org.eclipse.osee.ats.client.demo.test/src/org/eclipse/osee/ats/client/demo/config/DemoDbGroupsTest.java
index 6ea07c3491c..3d21cc61d87 100644
--- a/plugins/org.eclipse.osee.ats.config.demo.test/src/org/eclipse/osee/ats/config/demo/config/DemoDbGroupsTest.java
+++ b/plugins/org.eclipse.osee.ats.client.demo.test/src/org/eclipse/osee/ats/client/demo/config/DemoDbGroupsTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.config;
+package org.eclipse.osee.ats.client.demo.config;
 
 import java.util.Collection;
 import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
diff --git a/plugins/org.eclipse.osee.ats.config.demo/.classpath b/plugins/org.eclipse.osee.ats.client.demo/.classpath
index ad32c83a788..ad32c83a788 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/.classpath
+++ b/plugins/org.eclipse.osee.ats.client.demo/.classpath
diff --git a/plugins/org.eclipse.osee.ats.config.demo/.pmd b/plugins/org.eclipse.osee.ats.client.demo/.pmd
index c7b0a9fb3f5..c7b0a9fb3f5 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/.pmd
+++ b/plugins/org.eclipse.osee.ats.client.demo/.pmd
diff --git a/plugins/org.eclipse.osee.ats.config.demo/.project b/plugins/org.eclipse.osee.ats.client.demo/.project
index 19ace056441..f36e6204f97 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/.project
+++ b/plugins/org.eclipse.osee.ats.client.demo/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.osee.ats.config.demo</name>
+	<name>org.eclipse.osee.ats.client.demo</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/org.eclipse.osee.ats.config.demo/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF
index ffc0ca5e687..2e96c3060ee 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.client.demo/META-INF/MANIFEST.MF
@@ -1,10 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Demo Plug-in
-Bundle-SymbolicName: org.eclipse.osee.ats.config.demo;singleton:=true
+Bundle-SymbolicName: org.eclipse.osee.ats.client.demo;singleton:=true
 Bundle-Version: 0.11.0.qualifier
 Eclipse-ExtensibleAPI: true
-Bundle-Activator: org.eclipse.osee.ats.config.demo.internal.Activator
 Bundle-Vendor: Eclipse Open System Engineering Environment
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -62,5 +61,6 @@ Import-Package: org.eclipse.core.filesystem,
  org.eclipse.osee.framework.ui.swt,
  org.eclipse.osee.support.test.util
 Export-Package: 
- org.eclipse.osee.ats.config.demo
+ org.eclipse.osee.ats.client.demo
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Activator: org.eclipse.osee.ats.client.demo.internal.Activator
diff --git a/plugins/org.eclipse.osee.ats.config.demo/README.txt b/plugins/org.eclipse.osee.ats.client.demo/README.txt
index e4694ee66d5..e4694ee66d5 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/README.txt
+++ b/plugins/org.eclipse.osee.ats.client.demo/README.txt
diff --git a/plugins/org.eclipse.osee.ats.config.demo/build.properties b/plugins/org.eclipse.osee.ats.client.demo/build.properties
index ec770a0ff86..ec770a0ff86 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/build.properties
+++ b/plugins/org.eclipse.osee.ats.client.demo/build.properties
diff --git a/plugins/org.eclipse.osee.ats.config.demo/images/workflow.gif b/plugins/org.eclipse.osee.ats.client.demo/images/workflow.gif
index 78b70db6784..78b70db6784 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/images/workflow.gif
+++ b/plugins/org.eclipse.osee.ats.client.demo/images/workflow.gif
diff --git a/plugins/org.eclipse.osee.ats.config.demo/plugin.xml b/plugins/org.eclipse.osee.ats.client.demo/plugin.xml
index b6f1c1cf45e..07470fc9cef 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/plugin.xml
+++ b/plugins/org.eclipse.osee.ats.client.demo/plugin.xml
@@ -4,7 +4,7 @@
     <extension
        point="org.eclipse.osee.framework.database.init.DatabaseInitializationConfiguration">
     <DatabaseInitializationConfiguration
-          classname="org.eclipse.osee.ats.config.demo.config.AddDbInitDemoChoice">
+          classname="org.eclipse.osee.ats.client.demo.config.AddDbInitDemoChoice">
     </DatabaseInitializationConfiguration>
  </extension>
       <extension
@@ -12,20 +12,20 @@
          point="org.eclipse.osee.framework.database.init.DatabaseInitializationTask">
    	<DatabaseInitializationTask
    			rule="org.eclipse.osee.framework.database.init.NotOnProductionDbInitializationRule"
-      	   classname="org.eclipse.osee.ats.config.demo.config.DemoDatabaseConfig">
+      	   classname="org.eclipse.osee.ats.client.demo.config.DemoDatabaseConfig">
    	</DatabaseInitializationTask>
 	</extension>
    <extension
          point="org.eclipse.osee.ats.AtsNavigateItem">
       <AtsNavigateItem
-            classname="org.eclipse.osee.ats.config.demo.navigate.DemoNavigateViewItems">
+            classname="org.eclipse.osee.ats.client.demo.navigate.DemoNavigateViewItems">
       </AtsNavigateItem>
    </extension>
       <extension
       	id="AddCommonBranchForAtsDemo"
          point="org.eclipse.osee.framework.database.init.DatabaseInitializationTask">
    	<DatabaseInitializationTask
-            classname="org.eclipse.osee.ats.config.demo.config.AddCommonBranchForAtsDemo">
+            classname="org.eclipse.osee.ats.client.demo.config.AddCommonBranchForAtsDemo">
       </DatabaseInitializationTask>
    </extension>
    <extension
@@ -39,13 +39,13 @@
    <extension
          point="org.eclipse.osee.ats.core.client.AtsTeamWorkflowProvider">
       <AtsTeamWorkflowProvider
-            classname="org.eclipse.osee.ats.config.demo.artifact.DemoTeamWorkflows">
+            classname="org.eclipse.osee.ats.client.demo.artifact.DemoTeamWorkflows">
       </AtsTeamWorkflowProvider>
    </extension>
    <extension
          point="org.eclipse.osee.framework.ui.skynet.ArtifactImageProvider">
       <ArtifactImageProvider
-            class="org.eclipse.osee.ats.config.demo.artifact.DemoArtifactImageProvider">
+            class="org.eclipse.osee.ats.client.demo.artifact.DemoArtifactImageProvider">
       </ArtifactImageProvider>
    </extension>
    <extension
@@ -53,7 +53,7 @@
          name="DemoWorkDefinitionSheetProvider"
          point="org.eclipse.osee.ats.AtsWorkDefinitionSheetProvider">
       <AtsWorkDefinitionSheetProvider
-            classname="org.eclipse.osee.ats.config.demo.config.DemoWorkDefinitionSheetProvider">
+            classname="org.eclipse.osee.ats.client.demo.config.DemoWorkDefinitionSheetProvider">
       </AtsWorkDefinitionSheetProvider>
    </extension>
    <extension
@@ -61,15 +61,15 @@
          name="DemoTraceUnitHandler"
          point="org.eclipse.osee.define.TraceUnitHandler">
       <TraceUnitHandler
-            TraceUnitParser="org.eclipse.osee.ats.config.demo.traceability.DemoTraceParser"
-            TraceUnitResourceLocator="org.eclipse.osee.ats.config.demo.traceability.DemoTraceUnitResourceLocator">
+            TraceUnitParser="org.eclipse.osee.ats.client.demo.traceability.DemoTraceParser"
+            TraceUnitResourceLocator="org.eclipse.osee.ats.client.demo.traceability.DemoTraceUnitResourceLocator">
       </TraceUnitHandler>
    </extension>
    <extension
          id="AtsConfigAddDemoUsers"
          point="org.eclipse.osee.framework.database.init.DatabaseInitializationTask">
       <DatabaseInitializationTask
-            classname="org.eclipse.osee.ats.config.demo.config.AtsConfigAddDemoUsers">
+            classname="org.eclipse.osee.ats.client.demo.config.AtsConfigAddDemoUsers">
       </DatabaseInitializationTask>
    </extension>
 
diff --git a/plugins/org.eclipse.osee.ats.config.demo/pom.xml b/plugins/org.eclipse.osee.ats.client.demo/pom.xml
index 36c851964b5..338b50af6b7 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/pom.xml
+++ b/plugins/org.eclipse.osee.ats.client.demo/pom.xml
@@ -5,14 +5,14 @@
 
 	<parent>
 		<groupId>org.eclipse.osee</groupId>
-		<artifactId>org.eclipse.osee.client.parent</artifactId>
+		<artifactId>org.eclipse.osee.ats.parent</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../../plugins/org.eclipse.osee.client.parent</relativePath>
+		<relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath>
 	</parent>
 
-	<artifactId>org.eclipse.osee.ats.config.demo</artifactId>
+	<artifactId>org.eclipse.osee.ats.client.demo</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<name>OSEE ATS Config Demo (Incubation)</name>
+	<name>OSEE ATS Client Demo (Incubation)</name>
 
    <build>
      <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/DemoCISBuilds.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoCISBuilds.java
index 9998b1ef259..8347cacf0cd 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/DemoCISBuilds.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoCISBuilds.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo;
+package org.eclipse.osee.ats.client.demo;
 
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.data.TokenFactory;
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/DemoCscis.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoCscis.java
index bd936c9a5f3..f24ce8dadd9 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/DemoCscis.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoCscis.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo;
+package org.eclipse.osee.ats.client.demo;
 
 /**
  * @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/DemoProgramAttributes.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoProgramAttributes.java
index 2f665cd8c26..6debd8f7516 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/DemoProgramAttributes.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoProgramAttributes.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo;
+package org.eclipse.osee.ats.client.demo;
 
 /**
  * @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/DemoSubsystems.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoSubsystems.java
index 581b95a26f1..5d31416fcf9 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/DemoSubsystems.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoSubsystems.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo;
+package org.eclipse.osee.ats.client.demo;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateDemoActions.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java
index c3ff2e59b17..8068e96edfc 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateDemoActions.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo;
+package org.eclipse.osee.ats.client.demo;
 
 import java.io.File;
 import java.util.Collection;
@@ -22,13 +22,13 @@ import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
 import org.eclipse.osee.ats.api.user.IAtsUser;
 import org.eclipse.osee.ats.api.version.IAtsVersion;
 import org.eclipse.osee.ats.api.workdef.ReviewBlockType;
-import org.eclipse.osee.ats.config.demo.config.DemoDbActionData;
-import org.eclipse.osee.ats.config.demo.config.DemoDbActionData.CreateReview;
-import org.eclipse.osee.ats.config.demo.config.DemoDbGroups;
-import org.eclipse.osee.ats.config.demo.config.DemoDbReviews;
-import org.eclipse.osee.ats.config.demo.config.DemoDbTasks;
-import org.eclipse.osee.ats.config.demo.config.DemoDbUtil;
-import org.eclipse.osee.ats.config.demo.internal.Activator;
+import org.eclipse.osee.ats.client.demo.config.DemoDbActionData;
+import org.eclipse.osee.ats.client.demo.config.DemoDbActionData.CreateReview;
+import org.eclipse.osee.ats.client.demo.config.DemoDbGroups;
+import org.eclipse.osee.ats.client.demo.config.DemoDbReviews;
+import org.eclipse.osee.ats.client.demo.config.DemoDbTasks;
+import org.eclipse.osee.ats.client.demo.config.DemoDbUtil;
+import org.eclipse.osee.ats.client.demo.internal.Activator;
 import org.eclipse.osee.ats.core.client.action.ActionArtifact;
 import org.eclipse.osee.ats.core.client.action.ActionArtifactRollup;
 import org.eclipse.osee.ats.core.client.action.ActionManager;
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateSawBuild2Actions.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateSawBuild2Actions.java
index b5233b6bc90..c151a126270 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateSawBuild2Actions.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateSawBuild2Actions.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo;
+package org.eclipse.osee.ats.client.demo;
 
 import java.util.Collection;
 import java.util.Date;
@@ -19,10 +19,10 @@ import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
 import org.eclipse.osee.ats.api.user.IAtsUser;
 import org.eclipse.osee.ats.api.version.IAtsVersion;
 import org.eclipse.osee.ats.api.workdef.ReviewBlockType;
-import org.eclipse.osee.ats.config.demo.config.DemoDbAIs;
-import org.eclipse.osee.ats.config.demo.config.DemoDbUtil;
-import org.eclipse.osee.ats.config.demo.config.DemoDbUtil.SoftwareRequirementStrs;
-import org.eclipse.osee.ats.config.demo.internal.Activator;
+import org.eclipse.osee.ats.client.demo.config.DemoDbAIs;
+import org.eclipse.osee.ats.client.demo.config.DemoDbUtil;
+import org.eclipse.osee.ats.client.demo.config.DemoDbUtil.SoftwareRequirementStrs;
+import org.eclipse.osee.ats.client.demo.internal.Activator;
 import org.eclipse.osee.ats.core.client.action.ActionArtifact;
 import org.eclipse.osee.ats.core.client.action.ActionManager;
 import org.eclipse.osee.ats.core.client.branch.AtsBranchManagerCore;
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoArtifactImageProvider.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/artifact/DemoArtifactImageProvider.java
index bf7c957abc7..fcdfd211837 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoArtifactImageProvider.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/artifact/DemoArtifactImageProvider.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.artifact;
+package org.eclipse.osee.ats.client.demo.artifact;
 
-import org.eclipse.osee.ats.config.demo.util.DemoImage;
+import org.eclipse.osee.ats.client.demo.util.DemoImage;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager;
 import org.eclipse.osee.framework.ui.skynet.ArtifactImageProvider;
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoTeamWorkflows.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/artifact/DemoTeamWorkflows.java
index 0148cb799b9..60ad3b30252 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoTeamWorkflows.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/artifact/DemoTeamWorkflows.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.artifact;
+package org.eclipse.osee.ats.client.demo.artifact;
 
 import java.util.Collection;
 import java.util.logging.Level;
@@ -16,7 +16,7 @@ import org.eclipse.osee.ats.actions.wizard.TeamWorkflowProviderAdapter;
 import org.eclipse.osee.ats.api.ai.IAtsActionableItem;
 import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
 import org.eclipse.osee.ats.api.team.IAtsTeamDefinition;
-import org.eclipse.osee.ats.config.demo.internal.Activator;
+import org.eclipse.osee.ats.client.demo.internal.Activator;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
 import org.eclipse.osee.framework.core.data.IArtifactType;
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/AddCommonBranchForAtsDemo.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/AddCommonBranchForAtsDemo.java
index 7d851048bb2..73ec04b4ebb 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/AddCommonBranchForAtsDemo.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/AddCommonBranchForAtsDemo.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.config;
+package org.eclipse.osee.ats.client.demo.config;
 
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.database.init.AddCommonBranch;
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/AddDbInitDemoChoice.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/AddDbInitDemoChoice.java
index 3b7c15286d7..4abffadc5d8 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/AddDbInitDemoChoice.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/AddDbInitDemoChoice.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.config;
+package org.eclipse.osee.ats.client.demo.config;
 
 import org.eclipse.osee.framework.database.init.DatabaseInitConfiguration;
 import org.eclipse.osee.framework.database.init.DefaultOseeTypeDefinitions;
@@ -26,17 +26,17 @@ public class AddDbInitDemoChoice implements IAddDbInitChoice {
    @Override
    public void addDbInitChoice(IGroupSelector groupSelection) {
       DatabaseInitConfiguration config = new DatabaseInitConfiguration();
-      config.addTask("org.eclipse.osee.ats.config.demo.AddCommonBranchForAtsDemo");
+      config.addTask("org.eclipse.osee.ats.client.demo.AddCommonBranchForAtsDemo");
       config.addTask("org.eclipse.osee.framework.access.provider.FrameworkAccessConfig");
-      config.addTask("org.eclipse.osee.ats.config.demo.AtsConfigAddDemoUsers");
+      config.addTask("org.eclipse.osee.ats.client.demo.AtsConfigAddDemoUsers");
       config.addTask("org.eclipse.osee.framework.database.init.SimpleTemplateProviderTask");
       config.addTask("org.eclipse.osee.ats.AtsDatabaseConfig");
-      config.addTask("org.eclipse.osee.ats.config.demo.DemoDatabaseConfig");
+      config.addTask("org.eclipse.osee.ats.client.demo.DemoDatabaseConfig");
 
       for (DefaultOseeTypeDefinitions types : DefaultOseeTypeDefinitions.values()) {
          config.addOseeType(types);
       }
-      config.addOseeType("org.eclipse.osee.ats.config.demo.OseeTypes_Demo");
+      config.addOseeType("org.eclipse.osee.ats.client.demo.OseeTypes_Demo");
       groupSelection.addChoice("OSEE Demo Database", config);
    }
 }
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/AtsConfigAddDemoUsers.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/AtsConfigAddDemoUsers.java
index 1664db40d71..6888a14b09e 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/AtsConfigAddDemoUsers.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/AtsConfigAddDemoUsers.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.config;
+package org.eclipse.osee.ats.client.demo.config;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDatabaseConfig.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfig.java
index 714beee4e5d..064ecc4ebb1 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDatabaseConfig.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDatabaseConfig.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.config;
+package org.eclipse.osee.ats.client.demo.config;
 
-import org.eclipse.osee.ats.config.demo.DemoCISBuilds;
-import org.eclipse.osee.ats.config.demo.DemoSubsystems;
+import org.eclipse.osee.ats.client.demo.DemoCISBuilds;
+import org.eclipse.osee.ats.client.demo.DemoSubsystems;
 import org.eclipse.osee.ats.core.client.util.AtsGroup;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbAIs.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbAIs.java
index 8640442a7df..4400ddd9fb3 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbAIs.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbAIs.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.config;
+package org.eclipse.osee.ats.client.demo.config;
 
 /**
  * @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbActionData.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbActionData.java
index f8632a041cc..bfc2ec54a01 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbActionData.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbActionData.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.config;
+package org.eclipse.osee.ats.client.demo.config;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbGroups.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbGroups.java
index f4a60351d09..3883bcd99bf 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbGroups.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbGroups.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.config;
+package org.eclipse.osee.ats.client.demo.config;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
-import org.eclipse.osee.ats.config.demo.internal.Activator;
+import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
+import org.eclipse.osee.ats.client.demo.internal.Activator;
 import org.eclipse.osee.ats.core.client.action.ActionManager;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
 import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
 import org.eclipse.osee.framework.logging.OseeLog;
@@ -34,7 +34,8 @@ public class DemoDbGroups {
 
    public static List<TeamWorkFlowArtifact> createGroups(boolean DEBUG) throws Exception {
 
-      SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Populate Demo DB - Create Groups");
+      SkynetTransaction transaction =
+         TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Populate Demo DB - Create Groups");
 
       // Create group of all resulting objects
       List<TeamWorkFlowArtifact> codeWorkflows = new ArrayList<TeamWorkFlowArtifact>();
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbReviews.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbReviews.java
index cfbdda677d2..86997074936 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbReviews.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbReviews.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.config;
+package org.eclipse.osee.ats.client.demo.config;
 
 import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED;
 import java.util.ArrayList;
@@ -16,7 +16,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.logging.Level;
 import org.eclipse.osee.ats.api.user.IAtsUser;
-import org.eclipse.osee.ats.config.demo.internal.Activator;
+import org.eclipse.osee.ats.client.demo.internal.Activator;
 import org.eclipse.osee.ats.core.client.review.DecisionReviewArtifact;
 import org.eclipse.osee.ats.core.client.review.DecisionReviewManager;
 import org.eclipse.osee.ats.core.client.review.DecisionReviewState;
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbTasks.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbTasks.java
index 1735883f1f6..236f73b3a29 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbTasks.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbTasks.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.config;
+package org.eclipse.osee.ats.client.demo.config;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -17,7 +17,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.logging.Level;
 import org.eclipse.osee.ats.api.user.IAtsUser;
-import org.eclipse.osee.ats.config.demo.internal.Activator;
+import org.eclipse.osee.ats.client.demo.internal.Activator;
 import org.eclipse.osee.ats.core.client.task.TaskArtifact;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.core.client.util.AtsUsersClient;
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbUtil.java
index 44651755cf7..a978237678f 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoDbUtil.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.config;
+package org.eclipse.osee.ats.client.demo.config;
 
 import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED;
 import java.util.ArrayList;
@@ -18,7 +18,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
 import org.eclipse.osee.ats.api.ai.IAtsActionableItem;
-import org.eclipse.osee.ats.config.demo.internal.Activator;
+import org.eclipse.osee.ats.client.demo.internal.Activator;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.core.config.ActionableItems;
 import org.eclipse.osee.ats.util.AtsUtil;
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoWorkDefinitionSheetProvider.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoWorkDefinitionSheetProvider.java
index 7d3df504faa..5bd92c184b2 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoWorkDefinitionSheetProvider.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/config/DemoWorkDefinitionSheetProvider.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.config;
+package org.eclipse.osee.ats.client.demo.config;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import org.eclipse.osee.ats.config.demo.internal.Activator;
+import org.eclipse.osee.ats.client.demo.internal.Activator;
 import org.eclipse.osee.ats.core.workdef.WorkDefinitionSheet;
 import org.eclipse.osee.ats.workdef.AtsWorkDefinitionSheetProviders;
 import org.eclipse.osee.ats.workdef.IAtsWorkDefinitionSheetProvider;
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/internal/Activator.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/internal/Activator.java
index 3a1df215505..6de162a64b1 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/internal/Activator.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/internal/Activator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.internal;
+package org.eclipse.osee.ats.client.demo.internal;
 
 import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
 
@@ -17,7 +17,7 @@ import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
  */
 public class Activator extends OseeUiActivator {
    private static Activator plugin;
-   public static final String PLUGIN_ID = "org.eclipse.osee.ats.config.demo";
+   public static final String PLUGIN_ID = "org.eclipse.osee.ats.client.demo";
 
    public Activator() {
       super(PLUGIN_ID);
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/CreateGoalTestDemoArtifacts.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/navigate/CreateGoalTestDemoArtifacts.java
index 9da8dccb2db..3b4b2da36a8 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/CreateGoalTestDemoArtifacts.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/navigate/CreateGoalTestDemoArtifacts.java
@@ -8,8 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-
-package org.eclipse.osee.ats.config.demo.navigate;
+package org.eclipse.osee.ats.client.demo.navigate;
 
 import java.util.Arrays;
 import java.util.Date;
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/DemoNavigateViewItems.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/navigate/DemoNavigateViewItems.java
index dad7095ac34..b7ee4b11973 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/DemoNavigateViewItems.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/navigate/DemoNavigateViewItems.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.navigate;
+package org.eclipse.osee.ats.client.demo.navigate;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -16,9 +16,9 @@ import java.util.List;
 import java.util.logging.Level;
 import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
 import org.eclipse.osee.ats.api.team.IAtsTeamDefinition;
+import org.eclipse.osee.ats.client.demo.PopulateDemoActions;
+import org.eclipse.osee.ats.client.demo.internal.Activator;
 import org.eclipse.osee.ats.config.ValidateAtsConfiguration;
-import org.eclipse.osee.ats.config.demo.PopulateDemoActions;
-import org.eclipse.osee.ats.config.demo.internal.Activator;
 import org.eclipse.osee.ats.core.config.AtsConfigCache;
 import org.eclipse.osee.ats.core.config.TeamDefinitions;
 import org.eclipse.osee.ats.health.ValidateAtsDatabase;
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/traceability/DemoTraceParser.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/traceability/DemoTraceParser.java
index e1b8454b083..b8c0c00787a 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/traceability/DemoTraceParser.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/traceability/DemoTraceParser.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.traceability;
+package org.eclipse.osee.ats.client.demo.traceability;
 
 import java.nio.CharBuffer;
 import java.util.Collection;
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/traceability/DemoTraceUnitResourceLocator.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/traceability/DemoTraceUnitResourceLocator.java
index 3161a9cc9aa..0234ff1417b 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/traceability/DemoTraceUnitResourceLocator.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/traceability/DemoTraceUnitResourceLocator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.traceability;
+package org.eclipse.osee.ats.client.demo.traceability;
 
 import java.nio.CharBuffer;
 import org.eclipse.core.filesystem.IFileStore;
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/util/DemoImage.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/util/DemoImage.java
index e65ed4f2f89..449b30099fe 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/util/DemoImage.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/util/DemoImage.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats.config.demo.util;
+package org.eclipse.osee.ats.client.demo.util;
 
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.ats.config.demo.internal.Activator;
+import org.eclipse.osee.ats.client.demo.internal.Activator;
 import org.eclipse.osee.framework.ui.swt.ImageManager;
 import org.eclipse.osee.framework.ui.swt.KeyedImage;
 
diff --git a/plugins/org.eclipse.osee.ats.config.demo/support/OseeTypes_Demo.osee b/plugins/org.eclipse.osee.ats.client.demo/support/OseeTypes_Demo.osee
index 8ffa271552e..8ffa271552e 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/support/OseeTypes_Demo.osee
+++ b/plugins/org.eclipse.osee.ats.client.demo/support/OseeTypes_Demo.osee
diff --git a/plugins/org.eclipse.osee.ats.config.demo/support/SAW-SoftwareRequirements.xml b/plugins/org.eclipse.osee.ats.client.demo/support/SAW-SoftwareRequirements.xml
index dd0327b7498..dd0327b7498 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/support/SAW-SoftwareRequirements.xml
+++ b/plugins/org.eclipse.osee.ats.client.demo/support/SAW-SoftwareRequirements.xml
diff --git a/plugins/org.eclipse.osee.ats.config.demo/support/SAW-SubsystemRequirements.xml b/plugins/org.eclipse.osee.ats.client.demo/support/SAW-SubsystemRequirements.xml
index 1f0d051eb05..1f0d051eb05 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/support/SAW-SubsystemRequirements.xml
+++ b/plugins/org.eclipse.osee.ats.client.demo/support/SAW-SubsystemRequirements.xml
diff --git a/plugins/org.eclipse.osee.ats.config.demo/support/SAW-SystemRequirements.xml b/plugins/org.eclipse.osee.ats.client.demo/support/SAW-SystemRequirements.xml
index dd876a9eadd..dd876a9eadd 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/support/SAW-SystemRequirements.xml
+++ b/plugins/org.eclipse.osee.ats.client.demo/support/SAW-SystemRequirements.xml
diff --git a/plugins/org.eclipse.osee.ats.config.demo/support/WorkDef_Demo_AIs_And_Team_Definitions.ats b/plugins/org.eclipse.osee.ats.client.demo/support/WorkDef_Demo_AIs_And_Team_Definitions.ats
index 8dc7b867d56..8dc7b867d56 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/support/WorkDef_Demo_AIs_And_Team_Definitions.ats
+++ b/plugins/org.eclipse.osee.ats.client.demo/support/WorkDef_Demo_AIs_And_Team_Definitions.ats
diff --git a/plugins/org.eclipse.osee.ats.config.demo/support/WorkDef_Team_Demo_Code.ats b/plugins/org.eclipse.osee.ats.client.demo/support/WorkDef_Team_Demo_Code.ats
index cb2506f058e..cb2506f058e 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/support/WorkDef_Team_Demo_Code.ats
+++ b/plugins/org.eclipse.osee.ats.client.demo/support/WorkDef_Team_Demo_Code.ats
diff --git a/plugins/org.eclipse.osee.ats.config.demo/support/WorkDef_Team_Demo_Req.ats b/plugins/org.eclipse.osee.ats.client.demo/support/WorkDef_Team_Demo_Req.ats
index f8447ab96ef..f8447ab96ef 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/support/WorkDef_Team_Demo_Req.ats
+++ b/plugins/org.eclipse.osee.ats.client.demo/support/WorkDef_Team_Demo_Req.ats
diff --git a/plugins/org.eclipse.osee.ats.config.demo/support/WorkDef_Team_Demo_SwDesign.ats b/plugins/org.eclipse.osee.ats.client.demo/support/WorkDef_Team_Demo_SwDesign.ats
index 7ae00310127..7ae00310127 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/support/WorkDef_Team_Demo_SwDesign.ats
+++ b/plugins/org.eclipse.osee.ats.client.demo/support/WorkDef_Team_Demo_SwDesign.ats
diff --git a/plugins/org.eclipse.osee.ats.config.demo/support/WorkDef_Team_Demo_Test.ats b/plugins/org.eclipse.osee.ats.client.demo/support/WorkDef_Team_Demo_Test.ats
index c9fbc982d91..c9fbc982d91 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/support/WorkDef_Team_Demo_Test.ats
+++ b/plugins/org.eclipse.osee.ats.client.demo/support/WorkDef_Team_Demo_Test.ats
diff --git a/plugins/org.eclipse.osee.ats.core.client/pom.xml b/plugins/org.eclipse.osee.ats.core.client/pom.xml
index 3f2098cb253..a5c9811fd8e 100644
--- a/plugins/org.eclipse.osee.ats.core.client/pom.xml
+++ b/plugins/org.eclipse.osee.ats.core.client/pom.xml
@@ -5,9 +5,9 @@
 
 	<parent>
 		<groupId>org.eclipse.osee</groupId>
-		<artifactId>org.eclipse.osee.client.parent</artifactId>
+		<artifactId>org.eclipse.osee.ats.parent</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../../plugins/org.eclipse.osee.client.parent</relativePath>
+		<relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.osee.ats.core.client</artifactId>
diff --git a/plugins/org.eclipse.osee.ats.core/pom.xml b/plugins/org.eclipse.osee.ats.core/pom.xml
index acb4f1a2148..8bd56aea64f 100644
--- a/plugins/org.eclipse.osee.ats.core/pom.xml
+++ b/plugins/org.eclipse.osee.ats.core/pom.xml
@@ -5,9 +5,9 @@
 
 	<parent>
 		<groupId>org.eclipse.osee</groupId>
-		<artifactId>org.eclipse.osee.client.parent</artifactId>
+		<artifactId>org.eclipse.osee.ats.parent</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../../plugins/org.eclipse.osee.client.parent</relativePath>
+		<relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.osee.ats.core</artifactId>
diff --git a/plugins/org.eclipse.osee.ats.dsl.ui/pom.xml b/plugins/org.eclipse.osee.ats.dsl.ui/pom.xml
index 00459b51541..c8e486a618d 100644
--- a/plugins/org.eclipse.osee.ats.dsl.ui/pom.xml
+++ b/plugins/org.eclipse.osee.ats.dsl.ui/pom.xml
@@ -5,9 +5,9 @@
 
 	<parent>
 		<groupId>org.eclipse.osee</groupId>
-		<artifactId>org.eclipse.osee.client.parent</artifactId>
+		<artifactId>org.eclipse.osee.ats.parent</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../../plugins/org.eclipse.osee.client.parent</relativePath>
+		<relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.osee.ats.dsl.ui</artifactId>
diff --git a/plugins/org.eclipse.osee.ats.dsl/pom.xml b/plugins/org.eclipse.osee.ats.dsl/pom.xml
index c836402d0b8..703a4243648 100644
--- a/plugins/org.eclipse.osee.ats.dsl/pom.xml
+++ b/plugins/org.eclipse.osee.ats.dsl/pom.xml
@@ -5,9 +5,9 @@
 
 	<parent>
 		<groupId>org.eclipse.osee</groupId>
-		<artifactId>org.eclipse.osee.client.parent</artifactId>
+		<artifactId>org.eclipse.osee.ats.parent</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../../plugins/org.eclipse.osee.client.parent</relativePath>
+		<relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.osee.ats.dsl</artifactId>
diff --git a/plugins/org.eclipse.osee.ats.help.ui/pom.xml b/plugins/org.eclipse.osee.ats.help.ui/pom.xml
index d910d526657..af34136cd20 100644
--- a/plugins/org.eclipse.osee.ats.help.ui/pom.xml
+++ b/plugins/org.eclipse.osee.ats.help.ui/pom.xml
@@ -5,9 +5,9 @@
 
 	<parent>
 		<groupId>org.eclipse.osee</groupId>
-		<artifactId>org.eclipse.osee.client.parent</artifactId>
+		<artifactId>org.eclipse.osee.ats.parent</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../../plugins/org.eclipse.osee.client.parent</relativePath>
+		<relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.osee.ats.help.ui</artifactId>
diff --git a/plugins/org.eclipse.osee.ats.impl/pom.xml b/plugins/org.eclipse.osee.ats.impl/pom.xml
index 08568f51888..c21fe57eb61 100644
--- a/plugins/org.eclipse.osee.ats.impl/pom.xml
+++ b/plugins/org.eclipse.osee.ats.impl/pom.xml
@@ -5,9 +5,9 @@
 
 	<parent>
 		<groupId>org.eclipse.osee</groupId>
-		<artifactId>org.eclipse.osee.client.parent</artifactId>
+		<artifactId>org.eclipse.osee.ats.parent</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../../plugins/org.eclipse.osee.client.parent</relativePath>
+		<relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.osee.ats.impl</artifactId>
diff --git a/plugins/org.eclipse.osee.ats.mocks/pom.xml b/plugins/org.eclipse.osee.ats.mocks/pom.xml
index 39b252b6042..e77c2c9a437 100644
--- a/plugins/org.eclipse.osee.ats.mocks/pom.xml
+++ b/plugins/org.eclipse.osee.ats.mocks/pom.xml
@@ -5,9 +5,9 @@
 
 	<parent>
 		<groupId>org.eclipse.osee</groupId>
-		<artifactId>org.eclipse.osee.client.parent</artifactId>
+		<artifactId>org.eclipse.osee.ats.parent</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../../plugins/org.eclipse.osee.client.parent</relativePath>
+		<relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.osee.ats.mocks</artifactId>
diff --git a/plugins/org.eclipse.osee.ats.p2/.project b/plugins/org.eclipse.osee.ats.p2/.project
new file mode 100644
index 00000000000..03efc31901a
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.p2/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.osee.ats.p2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.UpdateSiteBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.UpdateSiteNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.osee.ats.p2/category.xml b/plugins/org.eclipse.osee.ats.p2/category.xml
new file mode 100644
index 00000000000..1618aeba61b
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.p2/category.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature url="features/org.eclipse.osee.ats.feature_0.11.0.qualifier.jar" id="org.eclipse.osee.ats.feature" version="0.11.0.qualifier">
+      <category name="org.eclipse.osee.ats"/>
+   </feature>
+   <feature url="features/org.eclipse.osee.ats.feature.source_0.11.0.qualifier.jar" id="org.eclipse.osee.ats.feature.source" version="0.11.0.qualifier">
+      <category name="org.eclipse.osee.ats"/>
+   </feature>
+   <feature url="features/org.eclipse.osee.ats.client.demo.feature_0.11.0.qualifier.jar" id="org.eclipse.osee.ats.client.demo.feature" version="0.11.0.qualifier">
+      <category name="org.eclipse.osee.ats"/>
+   </feature>
+   <feature url="features/org.eclipse.osee.ats.client.demo.feature.source_0.11.0.qualifier.jar" id="org.eclipse.osee.ats.client.demo.feature.source" version="0.11.0.qualifier">
+      <category name="org.eclipse.osee.ats"/>
+   </feature>
+   <category-def name="org.eclipse.osee.ats" label="Eclipse OSEE ATS - (Incubation)">
+      <description>
+         Eclipse OSEE ATS - (Incubation)
+      </description>
+   </category-def>
+</site>
diff --git a/plugins/org.eclipse.osee.ats.p2/pom.xml b/plugins/org.eclipse.osee.ats.p2/pom.xml
new file mode 100644
index 00000000000..8847227573d
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.p2/pom.xml
@@ -0,0 +1,31 @@
+<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/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.eclipse.osee</groupId>
+		<artifactId>org.eclipse.osee.ats.parent</artifactId>
+		<version>0.11.0-SNAPSHOT</version>
+		<relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath>
+	</parent>
+
+	<artifactId>org.eclipse.osee.ats.p2</artifactId>
+	<packaging>eclipse-repository</packaging>
+	<name>OSEE ATS - p2 Site </name>
+	<version>0.11.0-SNAPSHOT</version>
+
+	<!-- <build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-repository-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<includeAllDependencies>true</includeAllDependencies>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build> -->
+
+</project>
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats.parent/.project b/plugins/org.eclipse.osee.ats.parent/.project
new file mode 100644
index 00000000000..481c469b0ed
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.parent/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.osee.ats.parent</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.osee.ats.parent/pom.xml b/plugins/org.eclipse.osee.ats.parent/pom.xml
new file mode 100644
index 00000000000..bc7cfe1e1e1
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.parent/pom.xml
@@ -0,0 +1,44 @@
+<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/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.eclipse.osee</groupId>
+		<artifactId>org.eclipse.osee.ide.parent</artifactId>
+		<version>0.11.0-SNAPSHOT</version>
+		<relativePath>../../plugins/org.eclipse.osee.ide.parent</relativePath>
+	</parent>
+	
+	<groupId>org.eclipse.osee</groupId>
+	<artifactId>org.eclipse.osee.ats.parent</artifactId>
+	<packaging>pom</packaging>
+	<name>OSEE ATS - Parent (Incubation)</name>
+	<version>0.11.0-SNAPSHOT</version>
+
+	<modules>
+      <module>../../plugins/org.eclipse.osee.ats.mocks</module>
+		<module>../../plugins/org.eclipse.osee.ats.help.ui</module>
+		<module>../../plugins/org.eclipse.osee.ats</module>
+		<module>../../plugins/org.eclipse.osee.ats.core</module>
+		<module>../../plugins/org.eclipse.osee.ats.core.client</module>
+		<module>../../plugins/org.eclipse.osee.ats.dsl</module>
+		<module>../../plugins/org.eclipse.osee.ats.dsl.ui</module>		
+		<module>../../plugins/org.eclipse.osee.ats.impl</module>
+		<module>../../plugins/org.eclipse.osee.ats.client.demo</module>
+
+      <module>../../plugins/org.eclipse.osee.ats.reports</module>
+      <module>../../plugins/org.eclipse.osee.ats.reports.burndown</module>
+      <module>../../plugins/org.eclipse.osee.ats.reports.efficiency</module>
+      <module>../../plugins/org.eclipse.osee.ats.reports.split</module>
+
+		<module>../../features/org.eclipse.osee.ats.feature</module>
+		<module>../../features/org.eclipse.osee.ats.feature.source</module>
+
+		<module>../../features/org.eclipse.osee.ats.client.demo.feature</module>
+		<module>../../features/org.eclipse.osee.ats.client.demo.feature.source</module>
+
+		<module>../../plugins/org.eclipse.osee.ats.p2</module>
+	</modules>
+
+</project>
diff --git a/plugins/org.eclipse.osee.ats.reports.burndown/pom.xml b/plugins/org.eclipse.osee.ats.reports.burndown/pom.xml
index 8a2fa39904a..ed3b37a83ca 100644
--- a/plugins/org.eclipse.osee.ats.reports.burndown/pom.xml
+++ b/plugins/org.eclipse.osee.ats.reports.burndown/pom.xml
@@ -5,9 +5,9 @@
 
 	<parent>
 		<groupId>org.eclipse.osee</groupId>
-		<artifactId>org.eclipse.osee.client.parent</artifactId>
+		<artifactId>org.eclipse.osee.ats.parent</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../../plugins/org.eclipse.osee.client.parent</relativePath>
+		<relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.osee.ats.reports.burndown</artifactId>
diff --git a/plugins/org.eclipse.osee.ats.reports.efficiency/pom.xml b/plugins/org.eclipse.osee.ats.reports.efficiency/pom.xml
index 98d436b2fc1..54f31027d7f 100644
--- a/plugins/org.eclipse.osee.ats.reports.efficiency/pom.xml
+++ b/plugins/org.eclipse.osee.ats.reports.efficiency/pom.xml
@@ -5,9 +5,9 @@
 
 	<parent>
 		<groupId>org.eclipse.osee</groupId>
-		<artifactId>org.eclipse.osee.client.parent</artifactId>
+		<artifactId>org.eclipse.osee.ats.parent</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../../plugins/org.eclipse.osee.client.parent</relativePath>
+		<relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.osee.ats.reports.efficiency</artifactId>
diff --git a/plugins/org.eclipse.osee.ats.reports.split/pom.xml b/plugins/org.eclipse.osee.ats.reports.split/pom.xml
index b50287a1345..9b4194e559b 100644
--- a/plugins/org.eclipse.osee.ats.reports.split/pom.xml
+++ b/plugins/org.eclipse.osee.ats.reports.split/pom.xml
@@ -5,9 +5,9 @@
 
 	<parent>
 		<groupId>org.eclipse.osee</groupId>
-		<artifactId>org.eclipse.osee.client.parent</artifactId>
+		<artifactId>org.eclipse.osee.ats.parent</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../../plugins/org.eclipse.osee.client.parent</relativePath>
+		<relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.osee.ats.reports.split</artifactId>
diff --git a/plugins/org.eclipse.osee.ats.reports/pom.xml b/plugins/org.eclipse.osee.ats.reports/pom.xml
index c18d96e7782..bb6e5594793 100644
--- a/plugins/org.eclipse.osee.ats.reports/pom.xml
+++ b/plugins/org.eclipse.osee.ats.reports/pom.xml
@@ -5,9 +5,9 @@
 
 	<parent>
 		<groupId>org.eclipse.osee</groupId>
-		<artifactId>org.eclipse.osee.client.parent</artifactId>
+		<artifactId>org.eclipse.osee.ats.parent</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../../plugins/org.eclipse.osee.client.parent</relativePath>
+		<relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.osee.ats.reports</artifactId>
diff --git a/plugins/org.eclipse.osee.ats/pom.xml b/plugins/org.eclipse.osee.ats/pom.xml
index 39d1be0d933..83f3a5eef54 100644
--- a/plugins/org.eclipse.osee.ats/pom.xml
+++ b/plugins/org.eclipse.osee.ats/pom.xml
@@ -5,9 +5,9 @@
 
 	<parent>
 		<groupId>org.eclipse.osee</groupId>
-		<artifactId>org.eclipse.osee.client.parent</artifactId>
+		<artifactId>org.eclipse.osee.ats.parent</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../../plugins/org.eclipse.osee.client.parent</relativePath>
+		<relativePath>../../plugins/org.eclipse.osee.ats.parent</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.osee.ats</artifactId>
diff --git a/plugins/org.eclipse.osee.client.parent/pom.xml b/plugins/org.eclipse.osee.client.parent/pom.xml
index db12246ce92..27bc6e0852f 100644
--- a/plugins/org.eclipse.osee.client.parent/pom.xml
+++ b/plugins/org.eclipse.osee.client.parent/pom.xml
@@ -62,21 +62,6 @@
 		<module>../../plugins/org.eclipse.osee.define.test</module>
 
 
-      <module>../../plugins/org.eclipse.osee.ats.mocks</module>
-		<module>../../plugins/org.eclipse.osee.ats.help.ui</module>
-		<module>../../plugins/org.eclipse.osee.ats</module>
-		<module>../../plugins/org.eclipse.osee.ats.core</module>
-		<module>../../plugins/org.eclipse.osee.ats.core.client</module>
-		<module>../../plugins/org.eclipse.osee.ats.dsl</module>
-		<module>../../plugins/org.eclipse.osee.ats.dsl.ui</module>
-		<module>../../plugins/org.eclipse.osee.ats.config.demo</module>
-		<module>../../plugins/org.eclipse.osee.ats.impl</module>
-
-      <module>../../plugins/org.eclipse.osee.ats.reports</module>
-      <module>../../plugins/org.eclipse.osee.ats.reports.burndown</module>
-      <module>../../plugins/org.eclipse.osee.ats.reports.efficiency</module>
-      <module>../../plugins/org.eclipse.osee.ats.reports.split</module>
-
 		<module>../../features/org.eclipse.osee.framework.feature</module>
 		<module>../../features/org.eclipse.osee.framework.feature.source</module>
 
@@ -86,12 +71,6 @@
 		<module>../../features/org.eclipse.osee.define.feature</module>
 		<module>../../features/org.eclipse.osee.define.feature.source</module>
 
-		<module>../../features/org.eclipse.osee.ats.feature</module>
-		<module>../../features/org.eclipse.osee.ats.feature.source</module>
-
-		<module>../../features/org.eclipse.osee.demo.feature</module>
-		<module>../../features/org.eclipse.osee.demo.feature.source</module>
-
 		<module>../../plugins/org.eclipse.osee.client.demo</module>
 
 		<module>../../plugins/org.eclipse.osee.client.test.framework</module>
diff --git a/plugins/org.eclipse.osee.ide.parent/pom.xml b/plugins/org.eclipse.osee.ide.parent/pom.xml
index 9c8ec2f75fa..5f14f5e2b69 100644
--- a/plugins/org.eclipse.osee.ide.parent/pom.xml
+++ b/plugins/org.eclipse.osee.ide.parent/pom.xml
@@ -20,6 +20,7 @@
 		<module>../../plugins/org.eclipse.osee.runtime.parent</module>
 		<module>../../plugins/org.eclipse.osee.ote.parent</module>
 		<module>../../plugins/org.eclipse.osee.client.parent</module>
+		<module>../../plugins/org.eclipse.osee.ats.parent</module>
 		<module>../../plugins/org.eclipse.osee.coverage.parent</module>
 		<module>../../plugins/org.eclipse.osee.client.all.parent</module>
 	</modules>
diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [H2].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [H2].launch
index c101b6ecd22..4c5bfa573a0 100644
--- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [H2].launch
+++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [H2].launch
@@ -34,7 +34,7 @@
 <setEntry value="org.eclipse.osee.x.server.legacy.feature:default"/>
 </setAttribute>
 <booleanAttribute key="show_selected_only" value="true"/>
-<stringAttribute key="timestamp" value="1349744064144"/>
+<stringAttribute key="timestamp" value="1352843622328"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="true"/>
 <booleanAttribute key="useDefaultConfigArea" value="true"/>