288 files changed, 24 insertions, 81 deletions

diff --git a/framework/pom.xml b/framework/pom.xml
deleted file mode 100644
index 72315ed1d..000000000
--- a/framework/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.mylyn.reviews</groupId>
-    <artifactId>org.eclipse.mylyn.reviews.parent</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>mylyn-reviews-framework-parent</artifactId>
-  <packaging>pom</packaging>
-  <modules>
-    <module>org.eclipse.mylyn.reviews.core</module>
-    <module>org.eclipse.mylyn.reviews.feature</module>
-    <module>org.eclipse.mylyn.reviews.sdk.feature</module>
-    <module>org.eclipse.mylyn.reviews.ui</module>
-  </modules>
-</project>
diff --git a/gerrit/pom.xml b/gerrit/pom.xml
deleted file mode 100644
index 1a82906c6..000000000
--- a/gerrit/pom.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.mylyn.reviews</groupId>
-    <artifactId>org.eclipse.mylyn.reviews.parent</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>mylyn-reviews-gerrit-parent</artifactId>
-  <packaging>pom</packaging>
-  <modules>
-    <module>org.eclipse.mylyn.gerrit.core</module>
-    <module>org.eclipse.mylyn.gerrit.core.tests</module>
-    <module>org.eclipse.mylyn.gerrit.tests</module>
-    <module>org.eclipse.mylyn.gerrit.ui</module>
-    <module>org.eclipse.mylyn.gerrit.ui.tests</module>
-    <module>org.eclipse.mylyn.gerrit.feature</module>
-    <module>org.eclipse.mylyn.gerrit.target</module>
-  </modules>
-</project>
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core.tests/.classpath b/org.eclipse.mylyn.gerrit.core.tests/.classpath
index ad32c83a7..ad32c83a7 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core.tests/.classpath
+++ b/org.eclipse.mylyn.gerrit.core.tests/.classpath
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core.tests/.project b/org.eclipse.mylyn.gerrit.core.tests/.project
index 700af3ef8..700af3ef8 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core.tests/.project
+++ b/org.eclipse.mylyn.gerrit.core.tests/.project
diff --git a/framework/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2..5a0ad22d2 100644
--- a/framework/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.core.runtime.prefs
+++ b/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.core.runtime.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.jdt.core.prefs
index e6f2755b1..e6f2755b1 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.jdt.ui.prefs
index f6c0a161d..f6c0a161d 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.jdt.ui.prefs
+++ b/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/framework/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
index 5e7f2bd47..5e7f2bd47 100644
--- a/framework/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ b/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
diff --git a/framework/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
index d8c6d26af..d8c6d26af 100644
--- a/framework/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ b/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.mylyn.team.ui.prefs
index 0aaa5ca86..0aaa5ca86 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.mylyn.team.ui.prefs
+++ b/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.mylyn.team.ui.prefs
diff --git a/framework/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.pde.prefs
index e8f2d5620..e8f2d5620 100644
--- a/framework/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.pde.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.gerrit.core.tests/META-INF/MANIFEST.MF
index 5b7e0a279..5b7e0a279 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.gerrit.core.tests/META-INF/MANIFEST.MF
diff --git a/framework/org.eclipse.mylyn.reviews.core/about.html b/org.eclipse.mylyn.gerrit.core.tests/about.html
index d774b07c7..d774b07c7 100644
--- a/framework/org.eclipse.mylyn.reviews.core/about.html
+++ b/org.eclipse.mylyn.gerrit.core.tests/about.html
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core.tests/build.properties b/org.eclipse.mylyn.gerrit.core.tests/build.properties
index 9cbab3c13..9cbab3c13 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core.tests/build.properties
+++ b/org.eclipse.mylyn.gerrit.core.tests/build.properties
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core.tests/pom.xml b/org.eclipse.mylyn.gerrit.core.tests/pom.xml
index 56e9c6a28..12891f458 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core.tests/pom.xml
+++ b/org.eclipse.mylyn.gerrit.core.tests/pom.xml
@@ -4,7 +4,7 @@
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-	<artifactId>mylyn-reviews-gerrit-parent</artifactId>
+	<artifactId>org.eclipse.mylyn.reviews.parent</artifactId>
 	<groupId>org.eclipse.mylyn.reviews</groupId>
 	<version>0.9.0-SNAPSHOT</version>
   </parent>
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core.tests/src/org/eclipse/mylyn/internal/gerrit/core/GerritAttributeTest.java b/org.eclipse.mylyn.gerrit.core.tests/src/org/eclipse/mylyn/internal/gerrit/core/GerritAttributeTest.java
index 579aea701..579aea701 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core.tests/src/org/eclipse/mylyn/internal/gerrit/core/GerritAttributeTest.java
+++ b/org.eclipse.mylyn.gerrit.core.tests/src/org/eclipse/mylyn/internal/gerrit/core/GerritAttributeTest.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core.tests/src/org/eclipse/mylyn/internal/gerrit/core/GerritConnectorTest.java b/org.eclipse.mylyn.gerrit.core.tests/src/org/eclipse/mylyn/internal/gerrit/core/GerritConnectorTest.java
index 997b72a13..997b72a13 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core.tests/src/org/eclipse/mylyn/internal/gerrit/core/GerritConnectorTest.java
+++ b/org.eclipse.mylyn.gerrit.core.tests/src/org/eclipse/mylyn/internal/gerrit/core/GerritConnectorTest.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core.tests/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritHttpClientTest.java b/org.eclipse.mylyn.gerrit.core.tests/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritHttpClientTest.java
index 5d1274d2b..5d1274d2b 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core.tests/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritHttpClientTest.java
+++ b/org.eclipse.mylyn.gerrit.core.tests/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritHttpClientTest.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core.tests/src/org/eclipse/mylyn/internal/gerrit/core/egit/GerritToGitMappingTest.java b/org.eclipse.mylyn.gerrit.core.tests/src/org/eclipse/mylyn/internal/gerrit/core/egit/GerritToGitMappingTest.java
index 19b602c80..19b602c80 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core.tests/src/org/eclipse/mylyn/internal/gerrit/core/egit/GerritToGitMappingTest.java
+++ b/org.eclipse.mylyn.gerrit.core.tests/src/org/eclipse/mylyn/internal/gerrit/core/egit/GerritToGitMappingTest.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/.classpath b/org.eclipse.mylyn.gerrit.core/.classpath
index ad32c83a7..ad32c83a7 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/.classpath
+++ b/org.eclipse.mylyn.gerrit.core/.classpath
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/.project b/org.eclipse.mylyn.gerrit.core/.project
index a71cee51a..a71cee51a 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/.project
+++ b/org.eclipse.mylyn.gerrit.core/.project
diff --git a/framework/org.eclipse.mylyn.reviews.feature/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2..5a0ad22d2 100644
--- a/framework/org.eclipse.mylyn.reviews.feature/.settings/org.eclipse.core.runtime.prefs
+++ b/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.core.runtime.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.jdt.core.prefs
index bc2c501db..bc2c501db 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.jdt.ui.prefs
index f6c0a161d..f6c0a161d 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.jdt.ui.prefs
diff --git a/framework/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.ltk.core.refactoring.prefs
index 5e7f2bd47..5e7f2bd47 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ b/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.ltk.core.refactoring.prefs
diff --git a/framework/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
index d8c6d26af..d8c6d26af 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ b/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.mylyn.team.ui.prefs
index 0aaa5ca86..0aaa5ca86 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.mylyn.team.ui.prefs
+++ b/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.mylyn.team.ui.prefs
diff --git a/framework/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.pde.prefs
index e8f2d5620..e8f2d5620 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.pde.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.gerrit.core/META-INF/MANIFEST.MF
index 9c7121e7f..9c7121e7f 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.gerrit.core/META-INF/MANIFEST.MF
diff --git a/framework/org.eclipse.mylyn.reviews.ui/about.html b/org.eclipse.mylyn.gerrit.core/about.html
index d774b07c7..d774b07c7 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/about.html
+++ b/org.eclipse.mylyn.gerrit.core/about.html
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/build.properties b/org.eclipse.mylyn.gerrit.core/build.properties
index e858fe1b0..e858fe1b0 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/build.properties
+++ b/org.eclipse.mylyn.gerrit.core/build.properties
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/pom.xml b/org.eclipse.mylyn.gerrit.core/pom.xml
index c76065cac..2a68139da 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/pom.xml
+++ b/org.eclipse.mylyn.gerrit.core/pom.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>mylyn-reviews-gerrit-parent</artifactId>
+    <artifactId>org.eclipse.mylyn.reviews.parent</artifactId>
     <groupId>org.eclipse.mylyn.reviews</groupId>
     <version>0.9.0-SNAPSHOT</version>
   </parent>
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritConnector.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritConnector.java
index 4962afcca..4962afcca 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritConnector.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritConnector.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritCorePlugin.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritCorePlugin.java
index 33dd2cbb5..33dd2cbb5 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritCorePlugin.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritCorePlugin.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritOperationFactory.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritOperationFactory.java
index e10319f63..e10319f63 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritOperationFactory.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritOperationFactory.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritQuery.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritQuery.java
index b18213699..b18213699 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritQuery.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritQuery.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritTaskDataHandler.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritTaskDataHandler.java
index 849fb6a75..849fb6a75 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritTaskDataHandler.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritTaskDataHandler.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritTaskSchema.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritTaskSchema.java
index e62dc4ff2..e62dc4ff2 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritTaskSchema.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritTaskSchema.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritUtil.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritUtil.java
index 101b4f47d..101b4f47d 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritUtil.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritUtil.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritAuthenticationState.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritAuthenticationState.java
index be7c36df0..be7c36df0 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritAuthenticationState.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritAuthenticationState.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritChange.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritChange.java
index d1994c872..d1994c872 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritChange.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritChange.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritClient.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritClient.java
index f567187da..f567187da 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritClient.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritClient.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritConfiguration.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritConfiguration.java
index b636d61c4..b636d61c4 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritConfiguration.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritConfiguration.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritException.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritException.java
index 67f75bc30..67f75bc30 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritException.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritException.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritHttpClient.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritHttpClient.java
index 01d9405de..01d9405de 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritHttpClient.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritHttpClient.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritHttpException.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritHttpException.java
index c2e8fe71e..c2e8fe71e 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritHttpException.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritHttpException.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritLoginException.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritLoginException.java
index 4d7c2d60e..4d7c2d60e 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritLoginException.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritLoginException.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritPatchSetContent.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritPatchSetContent.java
index 1d350b234..1d350b234 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritPatchSetContent.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritPatchSetContent.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritService.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritService.java
index dd7286b95..dd7286b95 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritService.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritService.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritSystemInfo.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritSystemInfo.java
index 421339733..421339733 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritSystemInfo.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritSystemInfo.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/IOpenIdLocation.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/IOpenIdLocation.java
index 80dc055d7..80dc055d7 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/IOpenIdLocation.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/IOpenIdLocation.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/JSonSupport.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/JSonSupport.java
index 191602252..191602252 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/JSonSupport.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/JSonSupport.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/OpenIdAuthenticationRequest.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/OpenIdAuthenticationRequest.java
index 32087c03d..32087c03d 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/OpenIdAuthenticationRequest.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/OpenIdAuthenticationRequest.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/OpenIdAuthenticationResponse.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/OpenIdAuthenticationResponse.java
index 9b3fe5960..9b3fe5960 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/OpenIdAuthenticationResponse.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/OpenIdAuthenticationResponse.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/compat/ChangeDetailService.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/compat/ChangeDetailService.java
index 9ea7a63b7..9ea7a63b7 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/compat/ChangeDetailService.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/compat/ChangeDetailService.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/compat/ChangeDetailX.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/compat/ChangeDetailX.java
index 9ef0a5de4..9ef0a5de4 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/compat/ChangeDetailX.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/compat/ChangeDetailX.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/compat/PatchSetPublishDetailX.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/compat/PatchSetPublishDetailX.java
index a2fbb1f0f..a2fbb1f0f 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/compat/PatchSetPublishDetailX.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/compat/PatchSetPublishDetailX.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/compat/PermissionLabel.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/compat/PermissionLabel.java
index 80d6c8531..80d6c8531 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/compat/PermissionLabel.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/compat/PermissionLabel.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/egit/GerritToGitMapping.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/egit/GerritToGitMapping.java
index c18c657da..c18c657da 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/egit/GerritToGitMapping.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/egit/GerritToGitMapping.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/AbandonRequest.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/AbandonRequest.java
index d88491171..d88491171 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/AbandonRequest.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/AbandonRequest.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/AbstractRequest.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/AbstractRequest.java
index 3ea3beec4..3ea3beec4 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/AbstractRequest.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/AbstractRequest.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/AddReviewersRequest.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/AddReviewersRequest.java
index f146b5654..f146b5654 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/AddReviewersRequest.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/AddReviewersRequest.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/GerritOperation.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/GerritOperation.java
index 6be4dba07..6be4dba07 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/GerritOperation.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/GerritOperation.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/PublishRequest.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/PublishRequest.java
index 4a8f817dd..4a8f817dd 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/PublishRequest.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/PublishRequest.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/RefreshConfigRequest.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/RefreshConfigRequest.java
index dd205f641..dd205f641 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/RefreshConfigRequest.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/RefreshConfigRequest.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/RestoreRequest.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/RestoreRequest.java
index 2903715ba..2903715ba 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/RestoreRequest.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/RestoreRequest.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/SaveDraftRequest.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/SaveDraftRequest.java
index 1c5d137bc..1c5d137bc 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/SaveDraftRequest.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/SaveDraftRequest.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/SubmitRequest.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/SubmitRequest.java
index b2a2619ec..b2a2619ec 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/SubmitRequest.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/operations/SubmitRequest.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.feature/.project b/org.eclipse.mylyn.gerrit.feature/.project
index 427574835..427574835 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.feature/.project
+++ b/org.eclipse.mylyn.gerrit.feature/.project
diff --git a/framework/org.eclipse.mylyn.reviews.sdk.feature/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.mylyn.gerrit.feature/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2..5a0ad22d2 100644
--- a/framework/org.eclipse.mylyn.reviews.sdk.feature/.settings/org.eclipse.core.runtime.prefs
+++ b/org.eclipse.mylyn.gerrit.feature/.settings/org.eclipse.core.runtime.prefs
diff --git a/framework/org.eclipse.mylyn.reviews.feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.gerrit.feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
index 47ada1798..47ada1798 100644
--- a/framework/org.eclipse.mylyn.reviews.feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ b/org.eclipse.mylyn.gerrit.feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.feature/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.mylyn.gerrit.feature/.settings/org.eclipse.mylyn.team.ui.prefs
index 0aaa5ca86..0aaa5ca86 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.feature/.settings/org.eclipse.mylyn.team.ui.prefs
+++ b/org.eclipse.mylyn.gerrit.feature/.settings/org.eclipse.mylyn.team.ui.prefs
diff --git a/framework/org.eclipse.mylyn.reviews.feature/build.properties b/org.eclipse.mylyn.gerrit.feature/build.properties
index 8e3732e70..8e3732e70 100644
--- a/framework/org.eclipse.mylyn.reviews.feature/build.properties
+++ b/org.eclipse.mylyn.gerrit.feature/build.properties
diff --git a/framework/org.eclipse.mylyn.reviews.feature/epl-v10.html b/org.eclipse.mylyn.gerrit.feature/epl-v10.html
index ed4b19665..ed4b19665 100644
--- a/framework/org.eclipse.mylyn.reviews.feature/epl-v10.html
+++ b/org.eclipse.mylyn.gerrit.feature/epl-v10.html
diff --git a/gerrit/org.eclipse.mylyn.gerrit.feature/feature.properties b/org.eclipse.mylyn.gerrit.feature/feature.properties
index e60fb1b1f..e60fb1b1f 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.feature/feature.properties
+++ b/org.eclipse.mylyn.gerrit.feature/feature.properties
diff --git a/gerrit/org.eclipse.mylyn.gerrit.feature/feature.xml b/org.eclipse.mylyn.gerrit.feature/feature.xml
index 5e23e7881..5e23e7881 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.feature/feature.xml
+++ b/org.eclipse.mylyn.gerrit.feature/feature.xml
diff --git a/framework/org.eclipse.mylyn.reviews.feature/license.html b/org.eclipse.mylyn.gerrit.feature/license.html
index f19c483b9..f19c483b9 100644
--- a/framework/org.eclipse.mylyn.reviews.feature/license.html
+++ b/org.eclipse.mylyn.gerrit.feature/license.html
diff --git a/gerrit/org.eclipse.mylyn.gerrit.feature/org.eclipse.mylyn.gerrit.launch b/org.eclipse.mylyn.gerrit.feature/org.eclipse.mylyn.gerrit.launch
index 6166a4645..6166a4645 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.feature/org.eclipse.mylyn.gerrit.launch
+++ b/org.eclipse.mylyn.gerrit.feature/org.eclipse.mylyn.gerrit.launch
diff --git a/gerrit/org.eclipse.mylyn.gerrit.feature/pom.xml b/org.eclipse.mylyn.gerrit.feature/pom.xml
index fecdf0830..375f04b04 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.feature/pom.xml
+++ b/org.eclipse.mylyn.gerrit.feature/pom.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>mylyn-reviews-gerrit-parent</artifactId>
+    <artifactId>org.eclipse.mylyn.reviews.parent</artifactId>
     <groupId>org.eclipse.mylyn.reviews</groupId>
     <version>0.9.0-SNAPSHOT</version>
   </parent>
diff --git a/gerrit/org.eclipse.mylyn.gerrit.target/.project b/org.eclipse.mylyn.gerrit.target/.project
index 8be4854fa..8be4854fa 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.target/.project
+++ b/org.eclipse.mylyn.gerrit.target/.project
diff --git a/framework/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.mylyn.gerrit.target/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2..5a0ad22d2 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.core.runtime.prefs
+++ b/org.eclipse.mylyn.gerrit.target/.settings/org.eclipse.core.runtime.prefs
diff --git a/framework/org.eclipse.mylyn.reviews.sdk.feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.gerrit.target/.settings/org.eclipse.mylyn.tasks.ui.prefs
index 47ada1798..47ada1798 100644
--- a/framework/org.eclipse.mylyn.reviews.sdk.feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ b/org.eclipse.mylyn.gerrit.target/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.target/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.mylyn.gerrit.target/.settings/org.eclipse.mylyn.team.ui.prefs
index 0aaa5ca86..0aaa5ca86 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.target/.settings/org.eclipse.mylyn.team.ui.prefs
+++ b/org.eclipse.mylyn.gerrit.target/.settings/org.eclipse.mylyn.team.ui.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.target/gerrit.target b/org.eclipse.mylyn.gerrit.target/gerrit.target
index 1582d5a5a..1582d5a5a 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.target/gerrit.target
+++ b/org.eclipse.mylyn.gerrit.target/gerrit.target
diff --git a/gerrit/org.eclipse.mylyn.gerrit.target/pom.xml b/org.eclipse.mylyn.gerrit.target/pom.xml
index d9b9a717c..5c29e4afe 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.target/pom.xml
+++ b/org.eclipse.mylyn.gerrit.target/pom.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>mylyn-reviews-gerrit-parent</artifactId>
+    <artifactId>org.eclipse.mylyn.reviews.parent</artifactId>
     <groupId>org.eclipse.mylyn.reviews</groupId>
     <version>0.9.0-SNAPSHOT</version>
   </parent>
diff --git a/gerrit/org.eclipse.mylyn.gerrit.tests/.classpath b/org.eclipse.mylyn.gerrit.tests/.classpath
index b1a2fbe9e..b1a2fbe9e 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.tests/.classpath
+++ b/org.eclipse.mylyn.gerrit.tests/.classpath
diff --git a/gerrit/org.eclipse.mylyn.gerrit.tests/.project b/org.eclipse.mylyn.gerrit.tests/.project
index 5b6416dee..5b6416dee 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.tests/.project
+++ b/org.eclipse.mylyn.gerrit.tests/.project
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2..5a0ad22d2 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.core.runtime.prefs
+++ b/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.core.runtime.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.jdt.core.prefs
index e6f2755b1..e6f2755b1 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.jdt.ui.prefs
index f6c0a161d..f6c0a161d 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.jdt.ui.prefs
+++ b/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
index 5e7f2bd47..5e7f2bd47 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ b/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
index d8c6d26af..d8c6d26af 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ b/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.mylyn.team.ui.prefs
index 0aaa5ca86..0aaa5ca86 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.mylyn.team.ui.prefs
+++ b/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.mylyn.team.ui.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.pde.prefs
index e8f2d5620..e8f2d5620 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core.tests/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.pde.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.gerrit.tests/META-INF/MANIFEST.MF
index f19d27bf7..f19d27bf7 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.gerrit.tests/META-INF/MANIFEST.MF
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core.tests/about.html b/org.eclipse.mylyn.gerrit.tests/about.html
index d774b07c7..d774b07c7 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core.tests/about.html
+++ b/org.eclipse.mylyn.gerrit.tests/about.html
diff --git a/gerrit/org.eclipse.mylyn.gerrit.tests/build.properties b/org.eclipse.mylyn.gerrit.tests/build.properties
index 9cbab3c13..9cbab3c13 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.tests/build.properties
+++ b/org.eclipse.mylyn.gerrit.tests/build.properties
diff --git a/gerrit/org.eclipse.mylyn.gerrit.tests/pom.xml b/org.eclipse.mylyn.gerrit.tests/pom.xml
index d8e56604f..1f165453f 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.tests/pom.xml
+++ b/org.eclipse.mylyn.gerrit.tests/pom.xml
@@ -4,7 +4,7 @@
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-	<artifactId>mylyn-reviews-gerrit-parent</artifactId>
+	<artifactId>org.eclipse.mylyn.reviews.parent</artifactId>
 	<groupId>org.eclipse.mylyn.reviews</groupId>
 	<version>0.9.0-SNAPSHOT</version>
   </parent>
diff --git a/gerrit/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/core/client/GerritClientTest.java b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/core/client/GerritClientTest.java
index 4e5a4dcbb..4e5a4dcbb 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/core/client/GerritClientTest.java
+++ b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/core/client/GerritClientTest.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/support/GerritFixture.java b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/support/GerritFixture.java
index f1f711022..f1f711022 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/support/GerritFixture.java
+++ b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/support/GerritFixture.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/support/GerritHarness.java b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/support/GerritHarness.java
index a985b0736..a985b0736 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/support/GerritHarness.java
+++ b/org.eclipse.mylyn.gerrit.tests/src/org/eclipse/mylyn/gerrit/tests/support/GerritHarness.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/.classpath b/org.eclipse.mylyn.gerrit.ui.tests/.classpath
index ad32c83a7..ad32c83a7 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/.classpath
+++ b/org.eclipse.mylyn.gerrit.ui.tests/.classpath
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/.project b/org.eclipse.mylyn.gerrit.ui.tests/.project
index b7e6d90b4..b7e6d90b4 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/.project
+++ b/org.eclipse.mylyn.gerrit.ui.tests/.project
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2..5a0ad22d2 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.core.runtime.prefs
+++ b/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.core.runtime.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.jdt.core.prefs
index bc2c501db..bc2c501db 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.jdt.ui.prefs
index f6c0a161d..f6c0a161d 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.jdt.ui.prefs
+++ b/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
index 5e7f2bd47..5e7f2bd47 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ b/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
index d8c6d26af..d8c6d26af 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ b/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.mylyn.team.ui.prefs
index 0aaa5ca86..0aaa5ca86 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.mylyn.team.ui.prefs
+++ b/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.mylyn.team.ui.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.pde.prefs
index e8f2d5620..e8f2d5620 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.pde.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.gerrit.ui.tests/META-INF/MANIFEST.MF
index e68a4e839..e68a4e839 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.gerrit.ui.tests/META-INF/MANIFEST.MF
diff --git a/gerrit/org.eclipse.mylyn.gerrit.core/about.html b/org.eclipse.mylyn.gerrit.ui.tests/about.html
index d774b07c7..d774b07c7 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.core/about.html
+++ b/org.eclipse.mylyn.gerrit.ui.tests/about.html
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/build.properties b/org.eclipse.mylyn.gerrit.ui.tests/build.properties
index 9cbab3c13..9cbab3c13 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/build.properties
+++ b/org.eclipse.mylyn.gerrit.ui.tests/build.properties
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/pom.xml b/org.eclipse.mylyn.gerrit.ui.tests/pom.xml
index af249e4cb..e28185bb6 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/pom.xml
+++ b/org.eclipse.mylyn.gerrit.ui.tests/pom.xml
@@ -4,7 +4,7 @@
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-	<artifactId>mylyn-reviews-gerrit-parent</artifactId>
+	<artifactId>org.eclipse.mylyn.reviews.parent</artifactId>
 	<groupId>org.eclipse.mylyn.reviews</groupId>
 	<version>0.9.0-SNAPSHOT</version>
   </parent>
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/src/org/eclipse/mylyn/internal/gerrit/ui/ChangeIdHyperlinkTest.java b/org.eclipse.mylyn.gerrit.ui.tests/src/org/eclipse/mylyn/internal/gerrit/ui/ChangeIdHyperlinkTest.java
index 41c3870c7..41c3870c7 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/src/org/eclipse/mylyn/internal/gerrit/ui/ChangeIdHyperlinkTest.java
+++ b/org.eclipse.mylyn.gerrit.ui.tests/src/org/eclipse/mylyn/internal/gerrit/ui/ChangeIdHyperlinkTest.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/.classpath b/org.eclipse.mylyn.gerrit.ui/.classpath
index ad32c83a7..ad32c83a7 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/.classpath
+++ b/org.eclipse.mylyn.gerrit.ui/.classpath
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/.project b/org.eclipse.mylyn.gerrit.ui/.project
index f44b9ab1a..f44b9ab1a 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/.project
+++ b/org.eclipse.mylyn.gerrit.ui/.project
diff --git a/gerrit/org.eclipse.mylyn.gerrit.feature/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2..5a0ad22d2 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.feature/.settings/org.eclipse.core.runtime.prefs
+++ b/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.core.runtime.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.jdt.core.prefs
index 3b0b4b04d..3b0b4b04d 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.jdt.ui.prefs
index d92dfc1c1..d92dfc1c1 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
index 5e7f2bd47..5e7f2bd47 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ b/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
index d8c6d26af..d8c6d26af 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ b/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.mylyn.team.ui.prefs
index 0aaa5ca86..0aaa5ca86 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.mylyn.team.ui.prefs
+++ b/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.mylyn.team.ui.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.pde.prefs
index e8f2d5620..e8f2d5620 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.pde.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.gerrit.ui/META-INF/MANIFEST.MF
index b3730bc72..b3730bc72 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.gerrit.ui/META-INF/MANIFEST.MF
diff --git a/gerrit/org.eclipse.mylyn.gerrit.tests/about.html b/org.eclipse.mylyn.gerrit.ui/about.html
index d774b07c7..d774b07c7 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.tests/about.html
+++ b/org.eclipse.mylyn.gerrit.ui/about.html
diff --git a/framework/org.eclipse.mylyn.reviews.ui/build.properties b/org.eclipse.mylyn.gerrit.ui/build.properties
index d9c043bae..d9c043bae 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/build.properties
+++ b/org.eclipse.mylyn.gerrit.ui/build.properties
diff --git a/framework/org.eclipse.mylyn.reviews.ui/icons/eview16/overlay-review.png b/org.eclipse.mylyn.gerrit.ui/icons/eview16/overlay-review.png
index 256ab67a0..256ab67a0 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/icons/eview16/overlay-review.png
+++ b/org.eclipse.mylyn.gerrit.ui/icons/eview16/overlay-review.png
diff --git a/framework/org.eclipse.mylyn.reviews.ui/icons/gerrit-overlay.png b/org.eclipse.mylyn.gerrit.ui/icons/gerrit-overlay.png
index 25c213363..25c213363 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/icons/gerrit-overlay.png
+++ b/org.eclipse.mylyn.gerrit.ui/icons/gerrit-overlay.png
diff --git a/framework/org.eclipse.mylyn.reviews.ui/icons/gerrit.png b/org.eclipse.mylyn.gerrit.ui/icons/gerrit.png
index 3467e4725..3467e4725 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/icons/gerrit.png
+++ b/org.eclipse.mylyn.gerrit.ui/icons/gerrit.png
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/plugin.xml b/org.eclipse.mylyn.gerrit.ui/plugin.xml
index 54fdf1a8e..54fdf1a8e 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/plugin.xml
+++ b/org.eclipse.mylyn.gerrit.ui/plugin.xml
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/pom.xml b/org.eclipse.mylyn.gerrit.ui/pom.xml
index 2c2352df5..c7a4a23a7 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/pom.xml
+++ b/org.eclipse.mylyn.gerrit.ui/pom.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>mylyn-reviews-gerrit-parent</artifactId>
+    <artifactId>org.eclipse.mylyn.reviews.parent</artifactId>
     <groupId>org.eclipse.mylyn.reviews</groupId>
     <version>0.9.0-SNAPSHOT</version>
   </parent>
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritConnectorUi.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritConnectorUi.java
index a24f7c643..a24f7c643 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritConnectorUi.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritConnectorUi.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritImages.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritImages.java
index ba8e76946..ba8e76946 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritImages.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritImages.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritRepositoryLocationUi.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritRepositoryLocationUi.java
index 8ec17d975..8ec17d975 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritRepositoryLocationUi.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritRepositoryLocationUi.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritRepositorySettingsPage.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritRepositorySettingsPage.java
index e99e30dcc..e99e30dcc 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritRepositorySettingsPage.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritRepositorySettingsPage.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritReviewBehavior.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritReviewBehavior.java
index c099ea36f..c099ea36f 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritReviewBehavior.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritReviewBehavior.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritUiPlugin.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritUiPlugin.java
index af3e7f49d..af3e7f49d 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritUiPlugin.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/GerritUiPlugin.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/AbstractGerritSection.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/AbstractGerritSection.java
index e07e4b033..e07e4b033 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/AbstractGerritSection.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/AbstractGerritSection.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/ComparePatchSetJob.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/ComparePatchSetJob.java
index c4a064ece..c4a064ece 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/ComparePatchSetJob.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/ComparePatchSetJob.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/FetchPatchSetJob.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/FetchPatchSetJob.java
index 525a45a42..525a45a42 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/FetchPatchSetJob.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/FetchPatchSetJob.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/GerritTaskEditorPage.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/GerritTaskEditorPage.java
index ed45297e8..ed45297e8 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/GerritTaskEditorPage.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/GerritTaskEditorPage.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/GerritTaskEditorPageFactory.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/GerritTaskEditorPageFactory.java
index da7b67e8f..da7b67e8f 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/GerritTaskEditorPageFactory.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/GerritTaskEditorPageFactory.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/GetPatchSetContentJob.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/GetPatchSetContentJob.java
index ed4f53f03..ed4f53f03 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/GetPatchSetContentJob.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/GetPatchSetContentJob.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/PatchSetSection.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/PatchSetSection.java
index 6d4550d3a..6d4550d3a 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/PatchSetSection.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/PatchSetSection.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/ReviewItemLabelProvider.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/ReviewItemLabelProvider.java
index 9b891bfde..9b891bfde 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/ReviewItemLabelProvider.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/ReviewItemLabelProvider.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/ReviewSection.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/ReviewSection.java
index c70eee6fb..c70eee6fb 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/ReviewSection.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/ReviewSection.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/egit/EGitUiUtil.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/egit/EGitUiUtil.java
index 84eec7376..84eec7376 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/egit/EGitUiUtil.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/egit/EGitUiUtil.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/AbandonDialog.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/AbandonDialog.java
index 475892139..475892139 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/AbandonDialog.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/AbandonDialog.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/AddReviewersDialog.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/AddReviewersDialog.java
index 076f37658..076f37658 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/AddReviewersDialog.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/AddReviewersDialog.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/GerritOperationDialog.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/GerritOperationDialog.java
index 222290bde..222290bde 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/GerritOperationDialog.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/GerritOperationDialog.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/PublishDialog.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/PublishDialog.java
index 6a5c8e4cf..6a5c8e4cf 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/PublishDialog.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/PublishDialog.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/RestoreDialog.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/RestoreDialog.java
index a0b9f99cd..a0b9f99cd 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/RestoreDialog.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/RestoreDialog.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/SubmitDialog.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/SubmitDialog.java
index a13b9eb5d..a13b9eb5d 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/SubmitDialog.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/operations/SubmitDialog.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/GerritCustomQueryPage.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/GerritCustomQueryPage.java
index 1245386f2..1245386f2 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/GerritCustomQueryPage.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/GerritCustomQueryPage.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/ProjectNameContentProposal.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/ProjectNameContentProposal.java
index 3d3f68a8d..3d3f68a8d 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/ProjectNameContentProposal.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/ProjectNameContentProposal.java
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/ProjectNameContentProposalProvider.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/ProjectNameContentProposalProvider.java
index b45a36b58..b45a36b58 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/ProjectNameContentProposalProvider.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/wizards/ProjectNameContentProposalProvider.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/.classpath b/org.eclipse.mylyn.reviews.core/.classpath
index 304e86186..304e86186 100644
--- a/framework/org.eclipse.mylyn.reviews.core/.classpath
+++ b/org.eclipse.mylyn.reviews.core/.classpath
diff --git a/framework/org.eclipse.mylyn.reviews.core/.project b/org.eclipse.mylyn.reviews.core/.project
index 7b0cd5299..7b0cd5299 100644
--- a/framework/org.eclipse.mylyn.reviews.core/.project
+++ b/org.eclipse.mylyn.reviews.core/.project
diff --git a/framework/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.core.resources.prefs b/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.core.resources.prefs
index 325dab47e..325dab47e 100644
--- a/framework/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.core.resources.prefs
+++ b/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.core.resources.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.target/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2..5a0ad22d2 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.target/.settings/org.eclipse.core.runtime.prefs
+++ b/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.core.runtime.prefs
diff --git a/framework/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.jdt.core.prefs
index 8e95137ad..8e95137ad 100644
--- a/framework/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/framework/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.jdt.ui.prefs
index e2834b278..e2834b278 100644
--- a/framework/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.jdt.ui.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.ltk.core.refactoring.prefs
index 5e7f2bd47..5e7f2bd47 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ b/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.ltk.core.refactoring.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
index d8c6d26af..d8c6d26af 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ b/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/framework/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.mylyn.team.ui.prefs
index cb0d6dcc4..cb0d6dcc4 100644
--- a/framework/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.mylyn.team.ui.prefs
+++ b/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.mylyn.team.ui.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.pde.prefs
index e8f2d5620..e8f2d5620 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.pde.prefs
diff --git a/framework/org.eclipse.mylyn.reviews.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.core/META-INF/MANIFEST.MF
index 4c1ae90b8..4c1ae90b8 100644
--- a/framework/org.eclipse.mylyn.reviews.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.core/META-INF/MANIFEST.MF
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/about.html b/org.eclipse.mylyn.reviews.core/about.html
index d774b07c7..d774b07c7 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/about.html
+++ b/org.eclipse.mylyn.reviews.core/about.html
diff --git a/framework/org.eclipse.mylyn.reviews.core/build.properties b/org.eclipse.mylyn.reviews.core/build.properties
index 958e5cd32..958e5cd32 100644
--- a/framework/org.eclipse.mylyn.reviews.core/build.properties
+++ b/org.eclipse.mylyn.reviews.core/build.properties
diff --git a/framework/org.eclipse.mylyn.reviews.core/model/.gitignore b/org.eclipse.mylyn.reviews.core/model/.gitignore
index befd229a0..befd229a0 100644
--- a/framework/org.eclipse.mylyn.reviews.core/model/.gitignore
+++ b/org.eclipse.mylyn.reviews.core/model/.gitignore
diff --git a/framework/org.eclipse.mylyn.reviews.core/model/reviews.ecore b/org.eclipse.mylyn.reviews.core/model/reviews.ecore
index f26c7c965..f26c7c965 100644
--- a/framework/org.eclipse.mylyn.reviews.core/model/reviews.ecore
+++ b/org.eclipse.mylyn.reviews.core/model/reviews.ecore
diff --git a/framework/org.eclipse.mylyn.reviews.core/model/reviews.genmodel b/org.eclipse.mylyn.reviews.core/model/reviews.genmodel
index 23e73b0cd..23e73b0cd 100644
--- a/framework/org.eclipse.mylyn.reviews.core/model/reviews.genmodel
+++ b/org.eclipse.mylyn.reviews.core/model/reviews.genmodel
diff --git a/framework/org.eclipse.mylyn.reviews.core/plugin.properties b/org.eclipse.mylyn.reviews.core/plugin.properties
index 53d8f52ea..53d8f52ea 100644
--- a/framework/org.eclipse.mylyn.reviews.core/plugin.properties
+++ b/org.eclipse.mylyn.reviews.core/plugin.properties
diff --git a/framework/org.eclipse.mylyn.reviews.core/plugin.xml b/org.eclipse.mylyn.reviews.core/plugin.xml
index ae0190ec7..ae0190ec7 100644
--- a/framework/org.eclipse.mylyn.reviews.core/plugin.xml
+++ b/org.eclipse.mylyn.reviews.core/plugin.xml
diff --git a/framework/org.eclipse.mylyn.reviews.core/pom.xml b/org.eclipse.mylyn.reviews.core/pom.xml
index b6ec2032f..f3bd1f549 100644
--- a/framework/org.eclipse.mylyn.reviews.core/pom.xml
+++ b/org.eclipse.mylyn.reviews.core/pom.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>mylyn-reviews-framework-parent</artifactId>
+    <artifactId>org.eclipse.mylyn.reviews.parent</artifactId>
     <groupId>org.eclipse.mylyn.reviews</groupId>
     <version>0.9.0-SNAPSHOT</version>
   </parent>
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IComment.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IComment.java
index 8882e3058..8882e3058 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IComment.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IComment.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ICommentType.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ICommentType.java
index 86cebd7ef..86cebd7ef 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ICommentType.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ICommentType.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IFileItem.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IFileItem.java
index e1dab662a..e1dab662a 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IFileItem.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IFileItem.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IFileRevision.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IFileRevision.java
index d2f303410..d2f303410 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IFileRevision.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IFileRevision.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IItem.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IItem.java
index 12b127ca7..12b127ca7 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IItem.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IItem.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ILineLocation.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ILineLocation.java
index 65ee8b7c6..65ee8b7c6 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ILineLocation.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ILineLocation.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ILineRange.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ILineRange.java
index d7fae9c58..d7fae9c58 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ILineRange.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ILineRange.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ILocation.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ILocation.java
index 0ce63bc4b..0ce63bc4b 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ILocation.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ILocation.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReview.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReview.java
index b010f681b..b010f681b 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReview.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReview.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewComponent.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewComponent.java
index 7e82c7841..7e82c7841 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewComponent.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewComponent.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewGroup.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewGroup.java
index 230f8c9bd..230f8c9bd 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewGroup.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewGroup.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewItem.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewItem.java
index dcd2aa972..dcd2aa972 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewItem.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewItem.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewItemSet.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewItemSet.java
index 7de463d13..7de463d13 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewItemSet.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewItemSet.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewState.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewState.java
index 9cddfcaf1..9cddfcaf1 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewState.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewState.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewsFactory.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewsFactory.java
index 16d761089..16d761089 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewsFactory.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewsFactory.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ITaskReference.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ITaskReference.java
index 240d96442..240d96442 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ITaskReference.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ITaskReference.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ITopic.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ITopic.java
index ccad55f21..ccad55f21 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ITopic.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ITopic.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IUser.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IUser.java
index 403048dc7..403048dc7 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IUser.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IUser.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/Comment.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/Comment.java
index 2e059adac..2e059adac 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/Comment.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/Comment.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/CommentType.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/CommentType.java
index aff989eed..aff989eed 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/CommentType.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/CommentType.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/FileItem.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/FileItem.java
index 1f43d2d92..1f43d2d92 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/FileItem.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/FileItem.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/FileRevision.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/FileRevision.java
index 98a44eee5..98a44eee5 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/FileRevision.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/FileRevision.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/LineLocation.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/LineLocation.java
index a809eff98..a809eff98 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/LineLocation.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/LineLocation.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/LineRange.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/LineRange.java
index 5057cf601..5057cf601 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/LineRange.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/LineRange.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/Location.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/Location.java
index a10e4fadd..a10e4fadd 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/Location.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/Location.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/Review.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/Review.java
index efd6f15ca..efd6f15ca 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/Review.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/Review.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewComponent.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewComponent.java
index 8bb7d4828..8bb7d4828 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewComponent.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewComponent.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewGroup.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewGroup.java
index 3beaa802e..3beaa802e 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewGroup.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewGroup.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewItem.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewItem.java
index 9a3e9a323..9a3e9a323 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewItem.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewItem.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewItemSet.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewItemSet.java
index 0fddbdc4d..0fddbdc4d 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewItemSet.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewItemSet.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewState.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewState.java
index d7b3cfd43..d7b3cfd43 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewState.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewState.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsAdapterFactory.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsAdapterFactory.java
index fc92efd57..fc92efd57 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsAdapterFactory.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsAdapterFactory.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsFactory.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsFactory.java
index 6b7ab2f63..6b7ab2f63 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsFactory.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsFactory.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsPackage.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsPackage.java
index e1c80dd6b..e1c80dd6b 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsPackage.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsPackage.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsSwitch.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsSwitch.java
index 603c4cfef..603c4cfef 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsSwitch.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsSwitch.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/TaskReference.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/TaskReference.java
index ed3d67418..ed3d67418 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/TaskReference.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/TaskReference.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/Topic.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/Topic.java
index 534a04baa..534a04baa 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/Topic.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/Topic.java
diff --git a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/User.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/User.java
index fdbfc5679..fdbfc5679 100644
--- a/framework/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/User.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/User.java
diff --git a/framework/org.eclipse.mylyn.reviews.feature/.project b/org.eclipse.mylyn.reviews.feature/.project
index 1bb50d312..1bb50d312 100644
--- a/framework/org.eclipse.mylyn.reviews.feature/.project
+++ b/org.eclipse.mylyn.reviews.feature/.project
diff --git a/gerrit/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.mylyn.reviews.feature/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2..5a0ad22d2 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.tests/.settings/org.eclipse.core.runtime.prefs
+++ b/org.eclipse.mylyn.reviews.feature/.settings/org.eclipse.core.runtime.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.reviews.feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
index 47ada1798..47ada1798 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ b/org.eclipse.mylyn.reviews.feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/framework/org.eclipse.mylyn.reviews.sdk.feature/build.properties b/org.eclipse.mylyn.reviews.feature/build.properties
index 8e3732e70..8e3732e70 100644
--- a/framework/org.eclipse.mylyn.reviews.sdk.feature/build.properties
+++ b/org.eclipse.mylyn.reviews.feature/build.properties
diff --git a/framework/org.eclipse.mylyn.reviews.sdk.feature/epl-v10.html b/org.eclipse.mylyn.reviews.feature/epl-v10.html
index ed4b19665..ed4b19665 100644
--- a/framework/org.eclipse.mylyn.reviews.sdk.feature/epl-v10.html
+++ b/org.eclipse.mylyn.reviews.feature/epl-v10.html
diff --git a/framework/org.eclipse.mylyn.reviews.feature/feature.properties b/org.eclipse.mylyn.reviews.feature/feature.properties
index 2c263e907..2c263e907 100644
--- a/framework/org.eclipse.mylyn.reviews.feature/feature.properties
+++ b/org.eclipse.mylyn.reviews.feature/feature.properties
diff --git a/framework/org.eclipse.mylyn.reviews.feature/feature.xml b/org.eclipse.mylyn.reviews.feature/feature.xml
index 96661d212..96661d212 100644
--- a/framework/org.eclipse.mylyn.reviews.feature/feature.xml
+++ b/org.eclipse.mylyn.reviews.feature/feature.xml
diff --git a/framework/org.eclipse.mylyn.reviews.sdk.feature/license.html b/org.eclipse.mylyn.reviews.feature/license.html
index f19c483b9..f19c483b9 100644
--- a/framework/org.eclipse.mylyn.reviews.sdk.feature/license.html
+++ b/org.eclipse.mylyn.reviews.feature/license.html
diff --git a/framework/org.eclipse.mylyn.reviews.feature/pom.xml b/org.eclipse.mylyn.reviews.feature/pom.xml
index 1d83e8221..b4a41d472 100644
--- a/framework/org.eclipse.mylyn.reviews.feature/pom.xml
+++ b/org.eclipse.mylyn.reviews.feature/pom.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>mylyn-reviews-framework-parent</artifactId>
+    <artifactId>org.eclipse.mylyn.reviews.parent</artifactId>
     <groupId>org.eclipse.mylyn.reviews</groupId>
     <version>0.9.0-SNAPSHOT</version>
   </parent>
diff --git a/framework/org.eclipse.mylyn.reviews.sdk.feature/.project b/org.eclipse.mylyn.reviews.sdk.feature/.project
index deed8c2f6..deed8c2f6 100644
--- a/framework/org.eclipse.mylyn.reviews.sdk.feature/.project
+++ b/org.eclipse.mylyn.reviews.sdk.feature/.project
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.mylyn.reviews.sdk.feature/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2..5a0ad22d2 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui.tests/.settings/org.eclipse.core.runtime.prefs
+++ b/org.eclipse.mylyn.reviews.sdk.feature/.settings/org.eclipse.core.runtime.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.target/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.reviews.sdk.feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
index 47ada1798..47ada1798 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.target/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ b/org.eclipse.mylyn.reviews.sdk.feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.feature/build.properties b/org.eclipse.mylyn.reviews.sdk.feature/build.properties
index 8e3732e70..8e3732e70 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.feature/build.properties
+++ b/org.eclipse.mylyn.reviews.sdk.feature/build.properties
diff --git a/gerrit/org.eclipse.mylyn.gerrit.feature/epl-v10.html b/org.eclipse.mylyn.reviews.sdk.feature/epl-v10.html
index ed4b19665..ed4b19665 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.feature/epl-v10.html
+++ b/org.eclipse.mylyn.reviews.sdk.feature/epl-v10.html
diff --git a/framework/org.eclipse.mylyn.reviews.sdk.feature/feature.properties b/org.eclipse.mylyn.reviews.sdk.feature/feature.properties
index a556a154a..a556a154a 100644
--- a/framework/org.eclipse.mylyn.reviews.sdk.feature/feature.properties
+++ b/org.eclipse.mylyn.reviews.sdk.feature/feature.properties
diff --git a/framework/org.eclipse.mylyn.reviews.sdk.feature/feature.xml b/org.eclipse.mylyn.reviews.sdk.feature/feature.xml
index 95b7e95f1..95b7e95f1 100644
--- a/framework/org.eclipse.mylyn.reviews.sdk.feature/feature.xml
+++ b/org.eclipse.mylyn.reviews.sdk.feature/feature.xml
diff --git a/gerrit/org.eclipse.mylyn.gerrit.feature/license.html b/org.eclipse.mylyn.reviews.sdk.feature/license.html
index f19c483b9..f19c483b9 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.feature/license.html
+++ b/org.eclipse.mylyn.reviews.sdk.feature/license.html
diff --git a/framework/org.eclipse.mylyn.reviews.sdk.feature/pom.xml b/org.eclipse.mylyn.reviews.sdk.feature/pom.xml
index cd52008e8..3474c9eb9 100644
--- a/framework/org.eclipse.mylyn.reviews.sdk.feature/pom.xml
+++ b/org.eclipse.mylyn.reviews.sdk.feature/pom.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>mylyn-reviews-framework-parent</artifactId>
+    <artifactId>org.eclipse.mylyn.reviews.parent</artifactId>
     <groupId>org.eclipse.mylyn.reviews</groupId>
     <version>0.9.0-SNAPSHOT</version>
   </parent>
diff --git a/releng/org.eclipse.mylyn.reviews.site/.project b/org.eclipse.mylyn.reviews.site/.project
index 811c639e5..811c639e5 100644
--- a/releng/org.eclipse.mylyn.reviews.site/.project
+++ b/org.eclipse.mylyn.reviews.site/.project
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.mylyn.reviews.site/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2..5a0ad22d2 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.core.runtime.prefs
+++ b/org.eclipse.mylyn.reviews.site/.settings/org.eclipse.core.runtime.prefs
diff --git a/releng/org.eclipse.mylyn.reviews.site/assembly.xml b/org.eclipse.mylyn.reviews.site/assembly.xml
index 907a49c00..907a49c00 100644
--- a/releng/org.eclipse.mylyn.reviews.site/assembly.xml
+++ b/org.eclipse.mylyn.reviews.site/assembly.xml
diff --git a/releng/org.eclipse.mylyn.reviews.site/index.html b/org.eclipse.mylyn.reviews.site/index.html
index 6a23cdc02..6a23cdc02 100644
--- a/releng/org.eclipse.mylyn.reviews.site/index.html
+++ b/org.eclipse.mylyn.reviews.site/index.html
diff --git a/releng/org.eclipse.mylyn.reviews.site/pom.xml b/org.eclipse.mylyn.reviews.site/pom.xml
index 2c34f59a0..2c34f59a0 100644
--- a/releng/org.eclipse.mylyn.reviews.site/pom.xml
+++ b/org.eclipse.mylyn.reviews.site/pom.xml
diff --git a/releng/org.eclipse.mylyn.reviews.site/site.xml b/org.eclipse.mylyn.reviews.site/site.xml
index 5917b406b..a0c8c5f44 100644
--- a/releng/org.eclipse.mylyn.reviews.site/site.xml
+++ b/org.eclipse.mylyn.reviews.site/site.xml
@@ -16,9 +16,6 @@
    <feature url="features/org.eclipse.mylyn.reviews.tasks_0.0.0.jar" id="org.eclipse.mylyn.reviews.tasks" version="0.0.0">
       <category name="Features"/>
    </feature>
-   <feature url="features/org.eclipse.mylyn.reviews.r4e.feature_0.0.0.jar" id="org.eclipse.mylyn.reviews.r4e.feature" version="0.0.0">
-      <category name="Features"/>
-   </feature>
    <feature url="features/org.eclipse.mylyn.gerrit.feature_0.0.0.jar" id="org.eclipse.mylyn.gerrit.feature" version="0.0.0">
       <category name="Integration"/>
    </feature>
@@ -28,9 +25,6 @@
    <feature url="features/org.eclipse.mylyn.reviews.sdk.feature_0.0.0.jar" id="org.eclipse.mylyn.reviews.sdk.feature" version="0.0.0">
       <category name="SDK"/>
    </feature>
-   <feature url="features/org.eclipse.mylyn.reviews.r4e.reports_0.9.0.qualifier.jar" id="org.eclipse.mylyn.reviews.r4e.reports" version="0.9.0.qualifier">
-      <category name="Integration"/>
-   </feature>
    <category-def name="Features" label="Mylyn Reviews Features">
       <description>
          The Mylyn Reviews tools.
diff --git a/framework/org.eclipse.mylyn.reviews.ui/.classpath b/org.eclipse.mylyn.reviews.ui/.classpath
index 64c5e31b7..64c5e31b7 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/.classpath
+++ b/org.eclipse.mylyn.reviews.ui/.classpath
diff --git a/framework/org.eclipse.mylyn.reviews.ui/.project b/org.eclipse.mylyn.reviews.ui/.project
index 8d039bc90..8d039bc90 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/.project
+++ b/org.eclipse.mylyn.reviews.ui/.project
diff --git a/releng/org.eclipse.mylyn.reviews.site/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2..5a0ad22d2 100644
--- a/releng/org.eclipse.mylyn.reviews.site/.settings/org.eclipse.core.runtime.prefs
+++ b/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.core.runtime.prefs
diff --git a/framework/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.jdt.core.prefs
index bbaca6d64..bbaca6d64 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/framework/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.jdt.ui.prefs
index ae5a08748..ae5a08748 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
index 5e7f2bd47..5e7f2bd47 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ b/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
index d8c6d26af..d8c6d26af 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ b/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/framework/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.mylyn.team.ui.prefs
index cb0d6dcc4..cb0d6dcc4 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.mylyn.team.ui.prefs
+++ b/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.mylyn.team.ui.prefs
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.pde.prefs
index e8f2d5620..e8f2d5620 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/.settings/org.eclipse.pde.prefs
+++ b/org.eclipse.mylyn.reviews.ui/.settings/org.eclipse.pde.prefs
diff --git a/framework/org.eclipse.mylyn.reviews.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.ui/META-INF/MANIFEST.MF
index d5f887923..d5f887923 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.ui/META-INF/MANIFEST.MF
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/about.html b/org.eclipse.mylyn.reviews.ui/about.html
index d774b07c7..d774b07c7 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/about.html
+++ b/org.eclipse.mylyn.reviews.ui/about.html
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/build.properties b/org.eclipse.mylyn.reviews.ui/build.properties
index d9c043bae..d9c043bae 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/build.properties
+++ b/org.eclipse.mylyn.reviews.ui/build.properties
diff --git a/framework/org.eclipse.mylyn.reviews.ui/icons/eview16/annotation-review.gif b/org.eclipse.mylyn.reviews.ui/icons/eview16/annotation-review.gif
index c579106ac..c579106ac 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/icons/eview16/annotation-review.gif
+++ b/org.eclipse.mylyn.reviews.ui/icons/eview16/annotation-review.gif
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/icons/eview16/overlay-review.png b/org.eclipse.mylyn.reviews.ui/icons/eview16/overlay-review.png
index 256ab67a0..256ab67a0 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/icons/eview16/overlay-review.png
+++ b/org.eclipse.mylyn.reviews.ui/icons/eview16/overlay-review.png
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/icons/gerrit-overlay.png b/org.eclipse.mylyn.reviews.ui/icons/gerrit-overlay.png
index 25c213363..25c213363 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/icons/gerrit-overlay.png
+++ b/org.eclipse.mylyn.reviews.ui/icons/gerrit-overlay.png
diff --git a/gerrit/org.eclipse.mylyn.gerrit.ui/icons/gerrit.png b/org.eclipse.mylyn.reviews.ui/icons/gerrit.png
index 3467e4725..3467e4725 100644
--- a/gerrit/org.eclipse.mylyn.gerrit.ui/icons/gerrit.png
+++ b/org.eclipse.mylyn.reviews.ui/icons/gerrit.png
diff --git a/framework/org.eclipse.mylyn.reviews.ui/icons/obj16/review.png b/org.eclipse.mylyn.reviews.ui/icons/obj16/review.png
index 8258b30aa..8258b30aa 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/icons/obj16/review.png
+++ b/org.eclipse.mylyn.reviews.ui/icons/obj16/review.png
diff --git a/framework/org.eclipse.mylyn.reviews.ui/plugin.xml b/org.eclipse.mylyn.reviews.ui/plugin.xml
index 26a758dcc..26a758dcc 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/plugin.xml
+++ b/org.eclipse.mylyn.reviews.ui/plugin.xml
diff --git a/framework/org.eclipse.mylyn.reviews.ui/pom.xml b/org.eclipse.mylyn.reviews.ui/pom.xml
index ccedd2a95..f704e74ba 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/pom.xml
+++ b/org.eclipse.mylyn.reviews.ui/pom.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>mylyn-reviews-framework-parent</artifactId>
+    <artifactId>org.eclipse.mylyn.reviews.parent</artifactId>
     <groupId>org.eclipse.mylyn.reviews</groupId>
     <version>0.9.0-SNAPSHOT</version>
   </parent>
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/IReviewAction.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/IReviewAction.java
index f6ebf5a3b..f6ebf5a3b 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/IReviewAction.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/IReviewAction.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/IReviewActionListener.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/IReviewActionListener.java
index 513f92945..513f92945 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/IReviewActionListener.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/IReviewActionListener.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/ReviewUiUtil.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/ReviewUiUtil.java
index 803ae92f3..803ae92f3 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/ReviewUiUtil.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/ReviewUiUtil.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/ReviewsUiPlugin.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/ReviewsUiPlugin.java
index fdadbbfc1..fdadbbfc1 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/ReviewsUiPlugin.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/ReviewsUiPlugin.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/actions/AbstractReviewAction.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/actions/AbstractReviewAction.java
index 813035375..813035375 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/actions/AbstractReviewAction.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/actions/AbstractReviewAction.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/actions/AddLineCommentToFileAction.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/actions/AddLineCommentToFileAction.java
index 0f3ad9700..0f3ad9700 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/actions/AddLineCommentToFileAction.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/actions/AddLineCommentToFileAction.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentAnnotation.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentAnnotation.java
index 7423edc98..7423edc98 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentAnnotation.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentAnnotation.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentAnnotationHover.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentAnnotationHover.java
index 15f8e3ae7..15f8e3ae7 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentAnnotationHover.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentAnnotationHover.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentAnnotationHoverInput.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentAnnotationHoverInput.java
index 0df8a83ae..0df8a83ae 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentAnnotationHoverInput.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentAnnotationHoverInput.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentInformationControl.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentInformationControl.java
index 7f00e97c9..7f00e97c9 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentInformationControl.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentInformationControl.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentInformationControlCreator.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentInformationControlCreator.java
index 9c5f48445..9c5f48445 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentInformationControlCreator.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentInformationControlCreator.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentPopupDialog.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentPopupDialog.java
index 276dca149..276dca149 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentPopupDialog.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentPopupDialog.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/IReviewAnnotationModel.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/IReviewAnnotationModel.java
index 4182bd63b..4182bd63b 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/IReviewAnnotationModel.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/IReviewAnnotationModel.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/IReviewCompareSourceViewer.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/IReviewCompareSourceViewer.java
index 463fa0dad..463fa0dad 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/IReviewCompareSourceViewer.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/IReviewCompareSourceViewer.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/ReviewAnnotationModel.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/ReviewAnnotationModel.java
index a5f60a8c8..a5f60a8c8 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/ReviewAnnotationModel.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/ReviewAnnotationModel.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/ReviewCompareAnnotationModel.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/ReviewCompareAnnotationModel.java
index 97992c520..97992c520 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/ReviewCompareAnnotationModel.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/ReviewCompareAnnotationModel.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/ReviewCompareInputListener.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/ReviewCompareInputListener.java
index 2a0c1a8b2..2a0c1a8b2 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/ReviewCompareInputListener.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/ReviewCompareInputListener.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/dialogs/AddCommentDialog.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/dialogs/AddCommentDialog.java
index 33ff24513..33ff24513 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/dialogs/AddCommentDialog.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/dialogs/AddCommentDialog.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/AbstractCommentPart.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/AbstractCommentPart.java
index 202a9408b..202a9408b 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/AbstractCommentPart.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/AbstractCommentPart.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/CommentPart.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/CommentPart.java
index 81f068a94..81f068a94 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/CommentPart.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/CommentPart.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/ExpandablePart.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/ExpandablePart.java
index 8a8a4360d..8a8a4360d 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/ExpandablePart.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/ExpandablePart.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/TopicPart.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/TopicPart.java
index fca15335c..fca15335c 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/TopicPart.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/TopicPart.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/ruler/CommentAnnotationRulerColumn.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/ruler/CommentAnnotationRulerColumn.java
index 9d8018fec..9d8018fec 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/ruler/CommentAnnotationRulerColumn.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/ruler/CommentAnnotationRulerColumn.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/ruler/CommentAnnotationRulerHover.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/ruler/CommentAnnotationRulerHover.java
index 4c2d494cf..4c2d494cf 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/ruler/CommentAnnotationRulerHover.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/ruler/CommentAnnotationRulerHover.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/operations/ReviewCompareEditorInput.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/operations/ReviewCompareEditorInput.java
index d6cecdd9a..d6cecdd9a 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/operations/ReviewCompareEditorInput.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/operations/ReviewCompareEditorInput.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ProgressDialog.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ProgressDialog.java
index ce5f3687a..ce5f3687a 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ProgressDialog.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ProgressDialog.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ReviewBehavior.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ReviewBehavior.java
index 1a9e703f0..1a9e703f0 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ReviewBehavior.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ReviewBehavior.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ReviewUi.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ReviewUi.java
index 9804cfaae..9804cfaae 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ReviewUi.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/ReviewUi.java
diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/SizeCachingComposite.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/SizeCachingComposite.java
index b7bd7faf7..b7bd7faf7 100644
--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/SizeCachingComposite.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/reviews/ui/SizeCachingComposite.java
diff --git a/pom.xml b/pom.xml
index cb09ff6c8..acb3d3037 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,20 +74,25 @@
 		  <layout>p2</layout>
 		  <url>${mylyn-reviews-repository-url}</url>
 		</repository>
-		<repository>
-		  <id>eclipse-mylyn-orbit-committers</id>
-		  <layout>p2</layout>
-		  <url>http://build.eclipse.org/orbit/committers/orbit-I/20111224154307/I20111224154307/repository/</url>
-		</repository>
 	  </repositories>
 	  <modules>
 		<module>tbr</module>
-		<module>releng/org.eclipse.mylyn.reviews.site</module>
+		<module>org.eclipse.mylyn.reviews.site</module>
 	  </modules>
 	</profile>
   </profiles>
   <modules>
-    <module>framework</module>
-    <module>gerrit</module>
+	<module>org.eclipse.mylyn.gerrit.core</module>
+	<module>org.eclipse.mylyn.gerrit.core.tests</module>
+	<module>org.eclipse.mylyn.gerrit.feature</module>
+	<module>org.eclipse.mylyn.gerrit.target</module>
+	<module>org.eclipse.mylyn.gerrit.tests</module>
+	<module>org.eclipse.mylyn.gerrit.ui</module>
+	<module>org.eclipse.mylyn.gerrit.ui.tests</module>
+	<module>org.eclipse.mylyn.reviews.core</module>
+	<module>org.eclipse.mylyn.reviews.feature</module>
+	<module>org.eclipse.mylyn.reviews.sdk.feature</module>
+	<module>org.eclipse.mylyn.reviews.site</module>
+	<module>org.eclipse.mylyn.reviews.ui</module>
   </modules>
 </project>
diff --git a/versions/pom.xml b/versions/pom.xml
deleted file mode 100644
index 871385871..000000000
--- a/versions/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.mylyn.reviews</groupId>
-    <artifactId>org.eclipse.mylyn.reviews.parent</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>mylyn-versions-tasks-parent</artifactId>
-  <version>0.9.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <modules>
-    <module>org.eclipse.mylyn.versions.tasks.core</module>
-    <module>org.eclipse.mylyn.versions.tasks.ui</module>
-  </modules>
-</project>