Tycho: reduce groupId/version duplication, use o.e.hawk.tycho as groupId
diff --git a/core/plugins/org.eclipse.hawk.localfolder/pom.xml b/core/plugins/org.eclipse.hawk.localfolder/pom.xml
index 854a8d2..51bdeb3 100644
--- a/core/plugins/org.eclipse.hawk.localfolder/pom.xml
+++ b/core/plugins/org.eclipse.hawk.localfolder/pom.xml
@@ -3,15 +3,13 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.hawk</groupId>
+    <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.core.plugins</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
-  <groupId>org.eclipse.hawk</groupId>
   <artifactId>org.eclipse.hawk.localfolder</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/core/plugins/org.eclipse.hawk.orientdb/pom.xml b/core/plugins/org.eclipse.hawk.orientdb/pom.xml
index e549e79..5e75eb2 100644
--- a/core/plugins/org.eclipse.hawk.orientdb/pom.xml
+++ b/core/plugins/org.eclipse.hawk.orientdb/pom.xml
@@ -3,15 +3,13 @@
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.hawk</groupId>
+    <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.core.plugins</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
-  <groupId>org.eclipse.hawk</groupId>
   <artifactId>org.eclipse.hawk.orientdb</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/core/plugins/pom.xml b/core/plugins/pom.xml
index 0c33093..e1c4999 100644
--- a/core/plugins/pom.xml
+++ b/core/plugins/pom.xml
@@ -9,9 +9,9 @@
     <packaging>pom</packaging>
 
     <parent>
-        <groupId>org.eclipse.hawk</groupId>
-        <artifactId>org.eclipse.hawk.core</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <groupId>org.eclipse.hawk.tycho</groupId>
+        <artifactId>org.eclipse.hawk.core.parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 </project>
diff --git a/core/pom.xml b/core/pom.xml
index d8b5b04..14a9a7c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -5,7 +5,7 @@
 
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>org.eclipse.hawk.core</artifactId>
+  <artifactId>org.eclipse.hawk.core.parent</artifactId>
   <packaging>pom</packaging>
 
   <modules>
@@ -68,9 +68,9 @@
   </modules>
 
   <parent>
-    <groupId>org.eclipse.hawk</groupId>
+    <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.parent</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 </project>
diff --git a/core/releng/org.eclipse.hawk.targetplatform/pom.xml b/core/releng/org.eclipse.hawk.targetplatform/pom.xml
index ba78ca5..cfb607c 100644
--- a/core/releng/org.eclipse.hawk.targetplatform/pom.xml
+++ b/core/releng/org.eclipse.hawk.targetplatform/pom.xml
@@ -3,13 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.hawk</groupId>
+    <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.core.releng</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
   <artifactId>org.eclipse.hawk.targetplatform</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-target-definition</packaging>
 </project>
diff --git a/core/releng/org.eclipse.hawk.updatesite/pom.xml b/core/releng/org.eclipse.hawk.updatesite/pom.xml
index 4f6790f..d4e62cc 100644
--- a/core/releng/org.eclipse.hawk.updatesite/pom.xml
+++ b/core/releng/org.eclipse.hawk.updatesite/pom.xml
@@ -3,14 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.hawk</groupId>
+    <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.core.releng</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
   <artifactId>org.eclipse.hawk.updatesite</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <build>
diff --git a/core/releng/pom.xml b/core/releng/pom.xml
index 654ab24..909782f 100644
--- a/core/releng/pom.xml
+++ b/core/releng/pom.xml
@@ -9,9 +9,9 @@
     <packaging>pom</packaging>
 
     <parent>
-        <groupId>org.eclipse.hawk</groupId>
-        <artifactId>org.eclipse.hawk.core</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <groupId>org.eclipse.hawk.tycho</groupId>
+        <artifactId>org.eclipse.hawk.core.parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 </project>
diff --git a/core/tests/org.eclipse.hawk.backend.tests/pom.xml b/core/tests/org.eclipse.hawk.backend.tests/pom.xml
index d8f1fe8..fe2fdf0 100644
--- a/core/tests/org.eclipse.hawk.backend.tests/pom.xml
+++ b/core/tests/org.eclipse.hawk.backend.tests/pom.xml
@@ -5,13 +5,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>org.eclipse.hawk.core.tests</artifactId>
-		<groupId>org.eclipse.hawk</groupId>
-		<version>0.0.1-SNAPSHOT</version>
+		<groupId>org.eclipse.hawk.tycho</groupId>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.hawk.backend.tests</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/core/tests/org.eclipse.hawk.http.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.hawk.http.tests/META-INF/MANIFEST.MF
index 2a722f6..cc0f8cd 100644
--- a/core/tests/org.eclipse.hawk.http.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.hawk.http.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: HttpManager Tests
 Bundle-SymbolicName: org.eclipse.hawk.http.tests
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Fragment-Host: org.eclipse.hawk.http;bundle-version="2.0.0"
 Automatic-Module-Name: org.eclipse.hawk.http.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/core/tests/org.eclipse.hawk.integration.tests/pom.xml b/core/tests/org.eclipse.hawk.integration.tests/pom.xml
index 4b054fc..04afffd 100644
--- a/core/tests/org.eclipse.hawk.integration.tests/pom.xml
+++ b/core/tests/org.eclipse.hawk.integration.tests/pom.xml
@@ -5,13 +5,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>org.eclipse.hawk.core.tests</artifactId>
-		<groupId>org.eclipse.hawk</groupId>
-		<version>0.0.1-SNAPSHOT</version>
+		<groupId>org.eclipse.hawk.tycho</groupId>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.hawk.integration.tests</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/core/tests/org.eclipse.hawk.jgit.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.hawk.jgit.tests/META-INF/MANIFEST.MF
index f8d770d..65edf8d 100644
--- a/core/tests/org.eclipse.hawk.jgit.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.hawk.jgit.tests/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Tests for Hawk Local Folder VCS
+Bundle-Name: Tests for Hawk JGit VCS
 Bundle-SymbolicName: org.eclipse.hawk.jgit.tests
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Fragment-Host: org.eclipse.hawk.jgit;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.12.0",
diff --git a/core/tests/org.eclipse.hawk.localfolder.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.hawk.localfolder.tests/META-INF/MANIFEST.MF
index a82e9fb..d1e7135 100644
--- a/core/tests/org.eclipse.hawk.localfolder.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.hawk.localfolder.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for Hawk Local Folder VCS
 Bundle-SymbolicName: org.eclipse.hawk.localfolder.tests
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Fragment-Host: org.eclipse.hawk.localfolder;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.12.0",
diff --git a/core/tests/org.eclipse.hawk.svn.tests/pom.xml b/core/tests/org.eclipse.hawk.svn.tests/pom.xml
index a07d960..4943a6e 100644
--- a/core/tests/org.eclipse.hawk.svn.tests/pom.xml
+++ b/core/tests/org.eclipse.hawk.svn.tests/pom.xml
@@ -3,15 +3,13 @@
 	       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.hawk</groupId>
+    <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.core.tests</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
-  <groupId>org.eclipse.hawk</groupId>
   <artifactId>org.eclipse.hawk.svn.tests</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 </project>
diff --git a/core/tests/org.eclipse.hawk.timeaware.tests/pom.xml b/core/tests/org.eclipse.hawk.timeaware.tests/pom.xml
index 213817f..f728b20 100644
--- a/core/tests/org.eclipse.hawk.timeaware.tests/pom.xml
+++ b/core/tests/org.eclipse.hawk.timeaware.tests/pom.xml
@@ -5,13 +5,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>org.eclipse.hawk.core.tests</artifactId>
-    <groupId>org.eclipse.hawk</groupId>
-    <version>0.0.1-SNAPSHOT</version>
+    <groupId>org.eclipse.hawk.tycho</groupId>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
   <artifactId>org.eclipse.hawk.timeaware.tests</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/core/tests/org.eclipse.hawk.uml.tests/META-INF/MANIFEST.MF b/core/tests/org.eclipse.hawk.uml.tests/META-INF/MANIFEST.MF
index aee099c..e601e0e 100644
--- a/core/tests/org.eclipse.hawk.uml.tests/META-INF/MANIFEST.MF
+++ b/core/tests/org.eclipse.hawk.uml.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for UML support
 Bundle-SymbolicName: org.eclipse.hawk.uml.tests
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Fragment-Host: org.eclipse.hawk.uml;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.12.0"
diff --git a/core/tests/pom.xml b/core/tests/pom.xml
index 1ea9dde..b8d05cd 100644
--- a/core/tests/pom.xml
+++ b/core/tests/pom.xml
@@ -9,9 +9,9 @@
     <packaging>pom</packaging>
 
     <parent>
-        <groupId>org.eclipse.hawk</groupId>
-        <artifactId>org.eclipse.hawk.core</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <groupId>org.eclipse.hawk.tycho</groupId>
+        <artifactId>org.eclipse.hawk.core.parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 </project>
diff --git a/docs/org.eclipse.hawk.examples.docgen/META-INF/MANIFEST.MF b/docs/org.eclipse.hawk.examples.docgen/META-INF/MANIFEST.MF
index 3fdda69..61f2300 100644
--- a/docs/org.eclipse.hawk.examples.docgen/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.hawk.examples.docgen/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.hawk.examples.docgen;singleton:=true
 Automatic-Module-Name: org.eclipse.hawk.examples.docgen
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
diff --git a/greycat/org.eclipse.hawk.greycat.tests/pom.xml b/greycat/org.eclipse.hawk.greycat.tests/pom.xml
index 8bd4995..2264ad6 100644
--- a/greycat/org.eclipse.hawk.greycat.tests/pom.xml
+++ b/greycat/org.eclipse.hawk.greycat.tests/pom.xml
@@ -5,13 +5,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>org.eclipse.hawk.greycat.parent</artifactId>
-    <groupId>org.eclipse.hawk</groupId>
-    <version>0.0.1-SNAPSHOT</version>
+    <groupId>org.eclipse.hawk.tycho</groupId>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
   <artifactId>org.eclipse.hawk.greycat.tests</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <build>
diff --git a/greycat/org.eclipse.hawk.greycat.updatesite/pom.xml b/greycat/org.eclipse.hawk.greycat.updatesite/pom.xml
index 56f96cf..1518878 100644
--- a/greycat/org.eclipse.hawk.greycat.updatesite/pom.xml
+++ b/greycat/org.eclipse.hawk.greycat.updatesite/pom.xml
@@ -3,15 +3,12 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.hawk</groupId>
+    <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.greycat.parent</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
-  <groupId>org.eclipse.hawk</groupId>
   <artifactId>org.eclipse.hawk.greycat.updatesite</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
-
 </project>
diff --git a/greycat/org.eclipse.hawk.greycat/pom.xml b/greycat/org.eclipse.hawk.greycat/pom.xml
index e4d1a5f..e692bbf 100644
--- a/greycat/org.eclipse.hawk.greycat/pom.xml
+++ b/greycat/org.eclipse.hawk.greycat/pom.xml
@@ -3,15 +3,13 @@
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.hawk</groupId>
+    <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.parent</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 
-  <groupId>org.eclipse.hawk</groupId>
   <artifactId>org.eclipse.hawk.greycat</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/greycat/pom.xml b/greycat/pom.xml
index 4e9ab4e..c4dd79f 100644
--- a/greycat/pom.xml
+++ b/greycat/pom.xml
@@ -15,9 +15,9 @@
   </modules>
   
   <parent>
-    <groupId>org.eclipse.hawk</groupId>
+    <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.parent</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 </project>
diff --git a/neo4j2/org.eclipse.hawk.neo4j-v2/pom.xml b/neo4j2/org.eclipse.hawk.neo4j-v2/pom.xml
index 99ccfd5..ac6aab1 100644
--- a/neo4j2/org.eclipse.hawk.neo4j-v2/pom.xml
+++ b/neo4j2/org.eclipse.hawk.neo4j-v2/pom.xml
@@ -5,15 +5,13 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.eclipse.hawk</groupId>
+		<groupId>org.eclipse.hawk.tycho</groupId>
 		<artifactId>org.eclipse.hawk.neo4jv2.parent</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
-	<groupId>org.eclipse.hawk</groupId>
 	<artifactId>org.eclipse.hawk.neo4j-v2</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 	<build>
diff --git a/neo4j2/org.eclipse.hawk.neo4jv2.tests/pom.xml b/neo4j2/org.eclipse.hawk.neo4jv2.tests/pom.xml
index e97875a..5c75ed3 100644
--- a/neo4j2/org.eclipse.hawk.neo4jv2.tests/pom.xml
+++ b/neo4j2/org.eclipse.hawk.neo4jv2.tests/pom.xml
@@ -5,13 +5,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>org.eclipse.hawk.neo4jv2.parent</artifactId>
-    <groupId>org.eclipse.hawk</groupId>
-    <version>0.0.1-SNAPSHOT</version>
+    <groupId>org.eclipse.hawk.tycho</groupId>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
   <artifactId>org.eclipse.hawk.neo4jv2.tests</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <build>
diff --git a/neo4j2/pom.xml b/neo4j2/pom.xml
index b9d95e4..d4d1549 100644
--- a/neo4j2/pom.xml
+++ b/neo4j2/pom.xml
@@ -14,9 +14,9 @@
   </modules>
   
   <parent>
-    <groupId>org.eclipse.hawk</groupId>
+    <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.parent</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 </project>
diff --git a/pom.xml b/pom.xml
index c9bf00d..758d147 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,9 +3,9 @@
 	       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse.hawk</groupId>
+  <groupId>org.eclipse.hawk.tycho</groupId>
   <artifactId>org.eclipse.hawk.parent</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -77,9 +77,9 @@
 	      <configuration>
 	        <target>
 	          <artifact>
-	            <groupId>org.eclipse.hawk</groupId>
+	            <groupId>${project.groupId}</groupId>
 	            <artifactId>org.eclipse.hawk.targetplatform</artifactId>
-	            <version>2.0.0-SNAPSHOT</version>
+	            <version>${project.parent.version}</version>
 	          </artifact>
 	        </target>
           <environments>
diff --git a/server/plugins/org.eclipse.hawk.service.artemis/pom.xml b/server/plugins/org.eclipse.hawk.service.artemis/pom.xml
index 07b1910..ff5dcde 100644
--- a/server/plugins/org.eclipse.hawk.service.artemis/pom.xml
+++ b/server/plugins/org.eclipse.hawk.service.artemis/pom.xml
@@ -3,15 +3,13 @@
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.hawk</groupId>
+    <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.server.plugins</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
-  <groupId>org.eclipse.hawk</groupId>
   <artifactId>org.eclipse.hawk.service.artemis</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/server/plugins/org.eclipse.hawk.service.remote.thrift.timeaware/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.hawk.service.remote.thrift.timeaware/META-INF/MANIFEST.MF
index eb684a2..0e1ef96 100644
--- a/server/plugins/org.eclipse.hawk.service.remote.thrift.timeaware/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.hawk.service.remote.thrift.timeaware/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Hawk Time-Aware Remote Index Support
 Bundle-SymbolicName: org.eclipse.hawk.service.remote.thrift.timeaware;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse.org
 Automatic-Module-Name: org.eclipse.hawk.service.remote.thrift.timeaware
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/server/plugins/org.eclipse.hawk.service.server.users.servlet/pom.xml b/server/plugins/org.eclipse.hawk.service.server.users.servlet/pom.xml
index 8635d56..ed4806a 100644
--- a/server/plugins/org.eclipse.hawk.service.server.users.servlet/pom.xml
+++ b/server/plugins/org.eclipse.hawk.service.server.users.servlet/pom.xml
@@ -3,14 +3,13 @@
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.hawk</groupId>
+    <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.server.plugins</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
-  <groupId>org.eclipse.hawk</groupId>
+
   <artifactId>org.eclipse.hawk.service.server.users.servlet</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/server/plugins/pom.xml b/server/plugins/pom.xml
index de42600..33bbbd9 100644
--- a/server/plugins/pom.xml
+++ b/server/plugins/pom.xml
@@ -1,17 +1,18 @@
 <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"> 
+         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>
+  <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>org.eclipse.hawk.server.plugins</artifactId>
-    <packaging>pom</packaging>
+  <artifactId>org.eclipse.hawk.server.plugins</artifactId>
+  <packaging>pom</packaging>
 
-    <parent>
-        <groupId>org.eclipse.hawk</groupId>
-        <artifactId>org.eclipse.hawk.server.parent</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
+  <parent>
+    <groupId>org.eclipse.hawk.tycho</groupId>
+    <artifactId>org.eclipse.hawk.server.parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
+  </parent>
+
 </project>
diff --git a/server/pom.xml b/server/pom.xml
index fbb6c4a..32e1c13 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -51,9 +51,9 @@
   </modules>
 
   <parent>
-    <groupId>org.eclipse.hawk</groupId>
+    <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.parent</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/server/releng/org.eclipse.hawk.service.api.feature/pom.xml b/server/releng/org.eclipse.hawk.service.api.feature/pom.xml
index 9f51955..5606708 100644
--- a/server/releng/org.eclipse.hawk.service.api.feature/pom.xml
+++ b/server/releng/org.eclipse.hawk.service.api.feature/pom.xml
@@ -3,14 +3,13 @@
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.hawk</groupId>
+    <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.server.releng</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
-  <groupId>org.eclipse.hawk</groupId>
+
   <artifactId>org.eclipse.hawk.service.api.feature</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/server/releng/org.eclipse.hawk.service.cli.product/pom.xml b/server/releng/org.eclipse.hawk.service.cli.product/pom.xml
index b7e4364..ac6f3fe 100644
--- a/server/releng/org.eclipse.hawk.service.cli.product/pom.xml
+++ b/server/releng/org.eclipse.hawk.service.cli.product/pom.xml
@@ -4,14 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.eclipse.hawk</groupId>
+		<groupId>org.eclipse.hawk.tycho</groupId>
 		<artifactId>org.eclipse.hawk.server.releng</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.hawk.service.cli.product</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 
 	<build>
diff --git a/server/releng/org.eclipse.hawk.service.client.updatesite/pom.xml b/server/releng/org.eclipse.hawk.service.client.updatesite/pom.xml
index 4c44797..84d81b8 100644
--- a/server/releng/org.eclipse.hawk.service.client.updatesite/pom.xml
+++ b/server/releng/org.eclipse.hawk.service.client.updatesite/pom.xml
@@ -3,13 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.hawk</groupId>
+    <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.server.releng</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
-  <groupId>org.eclipse.hawk</groupId>
+
   <artifactId>org.eclipse.hawk.service.client.updatesite</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 </project>
diff --git a/server/releng/org.eclipse.hawk.service.server.feature/pom.xml b/server/releng/org.eclipse.hawk.service.server.feature/pom.xml
index 92e0839..7a3d1d5 100644
--- a/server/releng/org.eclipse.hawk.service.server.feature/pom.xml
+++ b/server/releng/org.eclipse.hawk.service.server.feature/pom.xml
@@ -3,15 +3,13 @@
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.hawk</groupId>
+    <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.server.releng</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
-  <groupId>org.eclipse.hawk</groupId>
   <artifactId>org.eclipse.hawk.service.server.feature</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/server/releng/org.eclipse.hawk.service.server.product/pom.xml b/server/releng/org.eclipse.hawk.service.server.product/pom.xml
index 68d1c0f..6ab02fd 100644
--- a/server/releng/org.eclipse.hawk.service.server.product/pom.xml
+++ b/server/releng/org.eclipse.hawk.service.server.product/pom.xml
@@ -4,14 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.eclipse.hawk</groupId>
+    <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.server.releng</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   
   <artifactId>org.eclipse.hawk.service.server.product</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <build>
diff --git a/server/releng/org.eclipse.hawk.service.server.updatesite/pom.xml b/server/releng/org.eclipse.hawk.service.server.updatesite/pom.xml
index 8e28c68..da23fed 100644
--- a/server/releng/org.eclipse.hawk.service.server.updatesite/pom.xml
+++ b/server/releng/org.eclipse.hawk.service.server.updatesite/pom.xml
@@ -3,13 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.hawk</groupId>
+    <groupId>org.eclipse.hawk.tycho</groupId>
     <artifactId>org.eclipse.hawk.server.releng</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
-  <groupId>org.eclipse.hawk</groupId>
+
   <artifactId>org.eclipse.hawk.service.server.updatesite</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 </project>
diff --git a/server/releng/pom.xml b/server/releng/pom.xml
index b2a1656..4a89fb7 100644
--- a/server/releng/pom.xml
+++ b/server/releng/pom.xml
@@ -9,9 +9,9 @@
     <packaging>pom</packaging>
 
     <parent>
-        <groupId>org.eclipse.hawk</groupId>
+        <groupId>org.eclipse.hawk.tycho</groupId>
         <artifactId>org.eclipse.hawk.server.parent</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 </project>
diff --git a/server/tests/org.eclipse.hawk.service.servlet.tests/META-INF/MANIFEST.MF b/server/tests/org.eclipse.hawk.service.servlet.tests/META-INF/MANIFEST.MF
index 129e236..a6c2d25 100644
--- a/server/tests/org.eclipse.hawk.service.servlet.tests/META-INF/MANIFEST.MF
+++ b/server/tests/org.eclipse.hawk.service.servlet.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests
 Bundle-SymbolicName: org.eclipse.hawk.service.servlet.tests
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Fragment-Host: org.eclipse.hawk.service.servlet;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit,
diff --git a/server/tests/pom.xml b/server/tests/pom.xml
index c9b6ee4..274fa3d 100644
--- a/server/tests/pom.xml
+++ b/server/tests/pom.xml
@@ -1,17 +1,18 @@
 <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"> 
+         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>
+  <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>org.eclipse.hawk.server.tests</artifactId>
-    <packaging>pom</packaging>
+  <artifactId>org.eclipse.hawk.server.tests</artifactId>
+  <packaging>pom</packaging>
 
-    <parent>
-        <groupId>org.eclipse.hawk</groupId>
-        <artifactId>org.eclipse.hawk.server.parent</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
+  <parent>
+    <groupId>org.eclipse.hawk.tycho</groupId>
+    <artifactId>org.eclipse.hawk.server.parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
+  </parent>
+
 </project>