diff --git a/addon-manager/addon/pom.xml b/addon-manager/addon/pom.xml
index c5015ff718..cf8f3f00b6 100644
--- a/addon-manager/addon/pom.xml
+++ b/addon-manager/addon/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addon-manager-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
@@ -12,25 +12,25 @@
 
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
          <optional>true</optional>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>addon-manager-api</artifactId>
          <scope>compile</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>addon-manager-impl</artifactId>
          <scope>runtime</scope>
       </dependency>
diff --git a/addon-manager/api/pom.xml b/addon-manager/api/pom.xml
index 77d23f94ab..a9fc189b0a 100644
--- a/addon-manager/api/pom.xml
+++ b/addon-manager/api/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addon-manager-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -15,7 +15,7 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies-api</artifactId>
          <scope>provided</scope>
       </dependency>
diff --git a/addon-manager/example/pom.xml b/addon-manager/example/pom.xml
index 14870f2568..46cfdf3e24 100644
--- a/addon-manager/example/pom.xml
+++ b/addon-manager/example/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.jboss.forge</groupId>
@@ -6,8 +7,11 @@
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../../pom.xml</relativePath>
    </parent>
+
+   <groupId>org.jboss.forge.addon</groupId>
    <artifactId>example</artifactId>
    <name>Forge - Example Addon</name>
+   
    <dependencies>
       <dependency>
          <groupId>org.jboss.forge.furnace</groupId>
@@ -15,7 +19,7 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>example2</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
diff --git a/addon-manager/example2/pom.xml b/addon-manager/example2/pom.xml
index 24932aeb1c..cfd54a49f4 100644
--- a/addon-manager/example2/pom.xml
+++ b/addon-manager/example2/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.jboss.forge</groupId>
@@ -6,8 +7,11 @@
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../../pom.xml</relativePath>
    </parent>
+
+   <groupId>org.jboss.forge.addon</groupId>
    <artifactId>example2</artifactId>
    <name>Forge - Example Addon 2</name>
+
    <dependencies>
       <dependency>
          <groupId>org.jboss.forge.furnace</groupId>
diff --git a/addon-manager/impl/pom.xml b/addon-manager/impl/pom.xml
index 3c42da5f1e..a95931a1aa 100644
--- a/addon-manager/impl/pom.xml
+++ b/addon-manager/impl/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addon-manager-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
@@ -17,21 +17,21 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>addon-manager-api</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui-api</artifactId>
          <scope>provided</scope>
       </dependency>
diff --git a/addon-manager/pom.xml b/addon-manager/pom.xml
index 90af4a80e8..14473347ed 100644
--- a/addon-manager/pom.xml
+++ b/addon-manager/pom.xml
@@ -7,6 +7,7 @@
       <relativePath>../pom.xml</relativePath>
    </parent>
 
+   <groupId>org.jboss.forge.addon</groupId>
    <artifactId>addon-manager-parent</artifactId>
    <name>Forge - Addon Manager - Parent</name>
    <packaging>pom</packaging>
@@ -24,17 +25,17 @@
    <dependencyManagement>
       <dependencies>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>addon-manager-api</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>ui-api</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>addon-manager-impl</artifactId>
             <version>${project.version}</version>
          </dependency>
diff --git a/addon-manager/tests/pom.xml b/addon-manager/tests/pom.xml
index 3a043eb2d4..7b2eb89587 100644
--- a/addon-manager/tests/pom.xml
+++ b/addon-manager/tests/pom.xml
@@ -12,25 +12,25 @@
 
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>addon-manager</artifactId>
          <version>${project.version}</version>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources</artifactId>
          <version>${project.version}</version>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>maven</artifactId>
          <version>${project.version}</version>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>example</artifactId>
          <version>${project.version}</version>
          <classifier>forge-addon</classifier>
diff --git a/addon-manager/tests/src/test/java/org/jboss/forge/addon/manager/AddonManagerTest.java b/addon-manager/tests/src/test/java/org/jboss/forge/addon/manager/AddonManagerTest.java
index 122e3f7822..5d3a9a5d6a 100644
--- a/addon-manager/tests/src/test/java/org/jboss/forge/addon/manager/AddonManagerTest.java
+++ b/addon-manager/tests/src/test/java/org/jboss/forge/addon/manager/AddonManagerTest.java
@@ -41,8 +41,8 @@ public class AddonManagerTest
 {
    @Deployment
    @Dependencies({
-            @Addon(name = "org.jboss.forge:addon-manager", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:maven", version = "2.0.0-SNAPSHOT")
+            @Addon(name = "org.jboss.forge.addon:addon-manager", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT")
    })
    public static ForgeArchive getDeployment()
    {
@@ -50,7 +50,7 @@ public static ForgeArchive getDeployment()
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:addon-manager", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:addon-manager", "2.0.0-SNAPSHOT"))
                );
 
       return archive;
@@ -69,7 +69,7 @@ public static ForgeArchive getDeployment()
    public void testInstallingAddonWithSingleOptionalAddonDependency() throws InterruptedException
    {
       int addonCount = registry.getAddons().size();
-      AddonId example = AddonId.fromCoordinates("org.jboss.forge:example,2.0.0-SNAPSHOT");
+      AddonId example = AddonId.fromCoordinates("org.jboss.forge.addon:example,2.0.0-SNAPSHOT");
       InstallRequest request = addonManager.install(example);
 
       Assert.assertEquals(0, request.getRequiredAddons().size());
@@ -87,14 +87,14 @@ public void testInstallingAddonWithSingleOptionalAddonDependency() throws Interr
       Set<AddonDependencyEntry> dependencies = repository.getAddonDependencies(example);
       Assert.assertEquals(1, dependencies.size());
       AddonDependencyEntry dependency = dependencies.toArray(new AddonDependencyEntry[dependencies.size()])[0];
-      Assert.assertEquals("org.jboss.forge:example2", dependency
+      Assert.assertEquals("org.jboss.forge.addon:example2", dependency
                .getId().getName());
       Assert.assertEquals(new SingleVersion("2.0.0-SNAPSHOT"), dependency
                .getId().getVersion());
       Assert.assertTrue(dependency.isOptional());
       Assert.assertFalse(dependency.isExported());
 
-      Assert.assertTrue(registry.getAddon(AddonId.from("org.jboss.forge:example2", "2.0.0-SNAPSHOT"))
+      Assert.assertTrue(registry.getAddon(AddonId.from("org.jboss.forge.addon:example2", "2.0.0-SNAPSHOT"))
                .getStatus().isMissing());
 
       Addons.waitUntilStarted(registry.getAddon(example), 10, TimeUnit.SECONDS);
@@ -105,7 +105,7 @@ public void testInstallingAddonWithSingleOptionalAddonDependency() throws Interr
    public void testInstallingAlreadyInstalledAddonWithTwoRequiredAddonDependency() throws InterruptedException
    {
       final int addonInitialCount = registry.getAddons().size();
-      AddonId resources = AddonId.fromCoordinates("org.jboss.forge:resources,2.0.0-SNAPSHOT");
+      AddonId resources = AddonId.fromCoordinates("org.jboss.forge.addon:resources,2.0.0-SNAPSHOT");
       InstallRequest request = addonManager.install(resources);
 
       Assert.assertEquals(1, request.getRequiredAddons().size());
@@ -116,15 +116,15 @@ public void testInstallingAlreadyInstalledAddonWithTwoRequiredAddonDependency()
       Assert.assertTrue(repository.isEnabled(resources));
       Assert.assertEquals(3, repository.getAddonResources(resources).size());
 
-      AddonId facets = AddonId.from("org.jboss.forge:facets", "2.0.0-SNAPSHOT");
+      AddonId facets = AddonId.from("org.jboss.forge.addon:facets", "2.0.0-SNAPSHOT");
       Assert.assertTrue(repository.isEnabled(facets));
 
       Set<AddonDependencyEntry> dependencies = repository.getAddonDependencies(resources);
       Assert.assertEquals(3, dependencies.size());
       List<String> addonDependenciesIds = new ArrayList<String>();
-      addonDependenciesIds.add("org.jboss.forge:convert");
-      addonDependenciesIds.add("org.jboss.forge:facets");
-      addonDependenciesIds.add("org.jboss.forge:ui-hints");
+      addonDependenciesIds.add("org.jboss.forge.addon:convert");
+      addonDependenciesIds.add("org.jboss.forge.addon:facets");
+      addonDependenciesIds.add("org.jboss.forge.addon:ui-hints");
 
       for (AddonDependencyEntry dependency : dependencies)
       {
diff --git a/addons/addon/pom.xml b/addons/addon/pom.xml
index 545650d57e..27b767c961 100644
--- a/addons/addon/pom.xml
+++ b/addons/addon/pom.xml
@@ -1,47 +1,49 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addons-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
+   
    <artifactId>addons</artifactId>
    <name>Forge - Addon Development Addon</name>
+   
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>addons-api</artifactId>
          <scope>compile</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>addons-impl</artifactId>
          <scope>runtime</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>maven</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>projects</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>javaee</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>parser-java</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
diff --git a/addons/api/pom.xml b/addons/api/pom.xml
index a4a4d6492b..d1fab520e9 100644
--- a/addons/api/pom.xml
+++ b/addons/api/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addons-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -15,37 +15,37 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>projects</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>maven</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>parser-java</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>javaee</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
diff --git a/addons/impl/pom.xml b/addons/impl/pom.xml
index fc13f5db22..518c89cd1a 100644
--- a/addons/impl/pom.xml
+++ b/addons/impl/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addons-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -14,41 +14,41 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>addons-api</artifactId>
       </dependency>
 
 
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui-api</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>javaee-api</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>maven-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>projects-api</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources-api</artifactId>
          <scope>provided</scope>
       </dependency>
diff --git a/addons/pom.xml b/addons/pom.xml
index 985c56f43d..9cfc29fa75 100644
--- a/addons/pom.xml
+++ b/addons/pom.xml
@@ -6,74 +6,79 @@
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
+   
+   <groupId>org.jboss.forge.addon</groupId>
    <artifactId>addons-parent</artifactId>
+   
    <packaging>pom</packaging>
    <name>Forge - Addon Development Addon Parent</name>
+   
    <modules>
       <module>api</module>
       <module>impl</module>
       <module>addon</module>
       <module>tests</module>
    </modules>
+   
    <dependencyManagement>
       <dependencies>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>addons</artifactId>
             <version>${project.version}</version>
             <classifier>forge-addon</classifier>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>addons-api</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>addons-impl</artifactId>
             <version>${project.version}</version>
          </dependency>
          <!-- Dependent Addons -->
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>dependencies</artifactId>
             <classifier>forge-addon</classifier>
             <version>2.0.0-SNAPSHOT</version>
             <scope>provided</scope>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>resources</artifactId>
             <classifier>forge-addon</classifier>
             <version>2.0.0-SNAPSHOT</version>
             <scope>provided</scope>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>projects</artifactId>
             <classifier>forge-addon</classifier>
             <version>2.0.0-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>ui</artifactId>
             <classifier>forge-addon</classifier>
             <version>2.0.0-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>maven</artifactId>
             <classifier>forge-addon</classifier>
             <version>2.0.0-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>javaee</artifactId>
             <classifier>forge-addon</classifier>
             <version>2.0.0-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>parser-java</artifactId>
             <classifier>forge-addon</classifier>
             <version>2.0.0-SNAPSHOT</version>
diff --git a/addons/tests/pom.xml b/addons/tests/pom.xml
index 83a3b75a74..95a6a1de35 100644
--- a/addons/tests/pom.xml
+++ b/addons/tests/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>addons-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -9,23 +9,23 @@
    <name>Forge - Addon Development Addon Tests</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>addons</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>javaee</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>aesh</artifactId>
          <classifier>forge-addon</classifier>
          <version>2.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>aesh-test-harness</artifactId>
          <classifier>forge-addon</classifier>
          <version>2.0.0-SNAPSHOT</version>
diff --git a/addons/tests/src/test/java/org/jboss/forge/addons/AddonProjectConfiguratorTest.java b/addons/tests/src/test/java/org/jboss/forge/addons/AddonProjectConfiguratorTest.java
index 6fb861e60f..386f23ea0a 100644
--- a/addons/tests/src/test/java/org/jboss/forge/addons/AddonProjectConfiguratorTest.java
+++ b/addons/tests/src/test/java/org/jboss/forge/addons/AddonProjectConfiguratorTest.java
@@ -41,7 +41,7 @@ public class AddonProjectConfiguratorTest
 {
    @Deployment
    @Dependencies({
-            @Addon(name = "org.jboss.forge:addons", version = "2.0.0-SNAPSHOT")
+            @Addon(name = "org.jboss.forge.addon:addons", version = "2.0.0-SNAPSHOT")
    })
    public static ForgeArchive getDeployment()
    {
@@ -49,8 +49,8 @@ public static ForgeArchive getDeployment()
                addBeansXML().
                addPackages(true, AddonProjectConfigurator.class.getPackage()).
                addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:addons", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:javaee", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:addons", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:javaee", "2.0.0-SNAPSHOT"))
                );
    }
 
diff --git a/addons/tests/src/test/java/org/jboss/forge/addons/NewAddonProjectAeshTest.java b/addons/tests/src/test/java/org/jboss/forge/addons/NewAddonProjectAeshTest.java
index 6d86b69a5f..8f6e7a5f39 100644
--- a/addons/tests/src/test/java/org/jboss/forge/addons/NewAddonProjectAeshTest.java
+++ b/addons/tests/src/test/java/org/jboss/forge/addons/NewAddonProjectAeshTest.java
@@ -31,14 +31,14 @@
 public class NewAddonProjectAeshTest
 {
    @Deployment
-   @Dependencies({ @Addon(name = "org.jboss.forge:ui", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:aesh-test-harness", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:aesh", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:dependencies", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:maven", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:addons", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:resources", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:projects", version = "2.0.0-SNAPSHOT")
+   @Dependencies({ @Addon(name = "org.jboss.forge.addon:ui", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:aesh-test-harness", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:aesh", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:dependencies", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:addons", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:projects", version = "2.0.0-SNAPSHOT")
    })
    public static ForgeArchive getDeployment()
    {
@@ -46,12 +46,12 @@ public static ForgeArchive getDeployment()
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:dependencies", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:ui", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:projects", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:aesh", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:aesh-test-harness", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:resources", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:dependencies", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:ui", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:aesh", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:aesh-test-harness", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT"))
                );
 
       return archive;
diff --git a/aesh/addon/pom.xml b/aesh/addon/pom.xml
index f195ea55be..81fadf520e 100644
--- a/aesh/addon/pom.xml
+++ b/aesh/addon/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>aesh-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
@@ -12,32 +12,32 @@
 
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>aesh-api</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>aesh-impl</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>aesh-spi</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>aesh-test-harness</artifactId>
          <classifier>forge-addon</classifier>
          <optional>true</optional>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui</artifactId>
          <classifier>forge-addon</classifier>
          <version>2.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>convert</artifactId>
          <classifier>forge-addon</classifier>
          <version>2.0.0-SNAPSHOT</version>
diff --git a/aesh/api/pom.xml b/aesh/api/pom.xml
index 5d7338bfd2..a5ddf30d6e 100644
--- a/aesh/api/pom.xml
+++ b/aesh/api/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>aesh-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
@@ -17,19 +17,19 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>aesh-spi</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui-api</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>convert-api</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <scope>provided</scope>
diff --git a/aesh/impl/pom.xml b/aesh/impl/pom.xml
index bca50cafd3..2e828a8c20 100644
--- a/aesh/impl/pom.xml
+++ b/aesh/impl/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>aesh-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
@@ -12,12 +12,12 @@
 
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>aesh-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>aesh-spi</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
@@ -38,13 +38,13 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui-api</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>convert-api</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <scope>provided</scope>
diff --git a/aesh/pom.xml b/aesh/pom.xml
index af369b9094..7316391567 100644
--- a/aesh/pom.xml
+++ b/aesh/pom.xml
@@ -7,7 +7,9 @@
       <relativePath>../pom.xml</relativePath>
    </parent>
 
+   <groupId>org.jboss.forge.addon</groupId>
    <artifactId>aesh-parent</artifactId>
+   
    <packaging>pom</packaging>
    <name>Forge - Aesh Addon Parent</name>
 
@@ -38,44 +40,44 @@
             <version>${version.aesh.extensions}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>aesh</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>aesh</artifactId>
             <version>${project.version}</version>
             <classifier>forge-addon</classifier>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>aesh-api</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>aesh-spi</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>aesh-spi</artifactId>
             <version>${project.version}</version>
             <classifier>forge-addon</classifier>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>aesh-impl</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>aesh-test-harness</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>aesh-test-harness</artifactId>
             <version>${project.version}</version>
             <classifier>forge-addon</classifier>
diff --git a/aesh/spi/pom.xml b/aesh/spi/pom.xml
index f2ee0c95b7..0a240be2c0 100644
--- a/aesh/spi/pom.xml
+++ b/aesh/spi/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>aesh-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
diff --git a/aesh/test-harness/pom.xml b/aesh/test-harness/pom.xml
index af057f61cc..ff7414b8d5 100644
--- a/aesh/test-harness/pom.xml
+++ b/aesh/test-harness/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>aesh-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
@@ -16,7 +16,7 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>aesh-spi</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
diff --git a/aesh/tests/pom.xml b/aesh/tests/pom.xml
index 2518bbf522..a1a22f8fce 100644
--- a/aesh/tests/pom.xml
+++ b/aesh/tests/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>aesh-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
@@ -10,18 +10,18 @@
    <name>Forge - Aesh Addon Tests</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>aesh</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources</artifactId>
          <classifier>forge-addon</classifier>
          <version>2.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>aesh-test-harness</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
diff --git a/aesh/tests/src/test/java/org/jboss/forge/aesh/AeshAddonTest.java b/aesh/tests/src/test/java/org/jboss/forge/aesh/AeshAddonTest.java
index 1bded2c2bc..0ba37daa9d 100644
--- a/aesh/tests/src/test/java/org/jboss/forge/aesh/AeshAddonTest.java
+++ b/aesh/tests/src/test/java/org/jboss/forge/aesh/AeshAddonTest.java
@@ -28,10 +28,10 @@ public class AeshAddonTest
    private KeyOperation completeChar = new KeyOperation(Key.CTRL_I, Operation.COMPLETE);
 
    @Deployment
-   @Dependencies({ @Addon(name = "org.jboss.forge:ui", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:aesh-test-harness", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:aesh", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:resources", version = "2.0.0-SNAPSHOT")
+   @Dependencies({ @Addon(name = "org.jboss.forge.addon:ui", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:aesh-test-harness", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:aesh", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT")
    })
    public static ForgeArchive getDeployment()
    {
@@ -40,10 +40,10 @@ public static ForgeArchive getDeployment()
                .addClasses(FooCommand.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:ui", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:aesh", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:aesh-test-harness", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:resources", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:ui", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:aesh", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:aesh-test-harness", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT"))
                );
 
       return archive;
diff --git a/aesh/tests/src/test/java/org/jboss/forge/aesh/TestAeshInstall.java b/aesh/tests/src/test/java/org/jboss/forge/aesh/TestAeshInstall.java
index fd1f76b9a3..8c1918e878 100644
--- a/aesh/tests/src/test/java/org/jboss/forge/aesh/TestAeshInstall.java
+++ b/aesh/tests/src/test/java/org/jboss/forge/aesh/TestAeshInstall.java
@@ -19,7 +19,7 @@ public void test()
       Forge forge = new ForgeImpl();
       AddonManager addonManager = new AddonManagerImpl(forge, new MavenDependencyResolver(
                new FileResourceFactory(), new MavenContainer()));
-      InstallRequest request = addonManager.install(AddonId.from("org.jboss.forge:aesh", "2.0.0-SNAPSHOT"));
+      InstallRequest request = addonManager.install(AddonId.from("org.jboss.forge.addon:aesh", "2.0.0-SNAPSHOT"));
       request.perform();
    }
 }
diff --git a/arquillian/core/pom.xml b/arquillian/core/pom.xml
index c07330f0e3..f8a7e741f0 100644
--- a/arquillian/core/pom.xml
+++ b/arquillian/core/pom.xml
@@ -18,19 +18,19 @@
          <artifactId>furnace-api</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>addon-manager-impl</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>maven-impl</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies-api</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources-api</artifactId>
       </dependency>
       <dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 3ef07ef17b..be9daafdd4 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -5,23 +5,25 @@
       <artifactId>forge-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
+   
    <artifactId>forge-bootstrap</artifactId>
    <name>Forge - Bootstrap module</name>
+   
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>addon-manager-impl</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>maven-impl</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies-api</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources-api</artifactId>
       </dependency>
       <dependency>
diff --git a/bootstrap/src/main/java/org/jboss/forge/bootstrap/Bootstrap.java b/bootstrap/src/main/java/org/jboss/forge/bootstrap/Bootstrap.java
index 5dc4dc0b85..81eb87aabe 100644
--- a/bootstrap/src/main/java/org/jboss/forge/bootstrap/Bootstrap.java
+++ b/bootstrap/src/main/java/org/jboss/forge/bootstrap/Bootstrap.java
@@ -185,7 +185,7 @@ private void install(String addonCoordinates)
          }
          else
          {
-            String coordinates = "org.jboss.forge:" + addonCoordinates;
+            String coordinates = "org.jboss.forge.addon:" + addonCoordinates;
             CoordinateBuilder coordinate = CoordinateBuilder.create(coordinates);
             List<Coordinate> versions = resolver.resolveVersions(DependencyQueryBuilder.create(coordinate));
             if (versions.isEmpty())
@@ -222,7 +222,7 @@ private void remove(String addonCoordinates)
          }
          else
          {
-            String coordinates = "org.jboss.forge:" + addonCoordinates;
+            String coordinates = "org.jboss.forge.addon:" + addonCoordinates;
             REPOS: for (AddonRepository repository : forge.getRepositories())
             {
                for (AddonId id : repository.listEnabled())
diff --git a/bootstrap/src/main/java/org/jboss/forge/bootstrap/listener/InstallRequiredAddonsListener.java b/bootstrap/src/main/java/org/jboss/forge/bootstrap/listener/InstallRequiredAddonsListener.java
index 308d014f61..de18be8c4d 100644
--- a/bootstrap/src/main/java/org/jboss/forge/bootstrap/listener/InstallRequiredAddonsListener.java
+++ b/bootstrap/src/main/java/org/jboss/forge/bootstrap/listener/InstallRequiredAddonsListener.java
@@ -125,7 +125,7 @@ private AddonId toAddonId(String addonCoordinate)
       }
       else
       {
-         String coordinates = "org.jboss.forge:" + addonCoordinate;
+         String coordinates = "org.jboss.forge.addon:" + addonCoordinate;
          CoordinateBuilder coordinate = CoordinateBuilder.create(coordinates);
          List<Coordinate> versions = resolver.resolveVersions(DependencyQueryBuilder.create(coordinate));
          if (versions.isEmpty())
diff --git a/container-api/src/test/java/org/jboss/forge/container/AddonIdTest.java b/container-api/src/test/java/org/jboss/forge/container/AddonIdTest.java
index 4113264b39..c5e53be24b 100644
--- a/container-api/src/test/java/org/jboss/forge/container/AddonIdTest.java
+++ b/container-api/src/test/java/org/jboss/forge/container/AddonIdTest.java
@@ -10,9 +10,9 @@ public class AddonIdTest
    @Test
    public void testFromCoordinatesMissingAPIVersion() throws Exception
    {
-      AddonId addon = AddonId.fromCoordinates("org.jboss.forge:resources,2.0.0-SNAPSHOT");
+      AddonId addon = AddonId.fromCoordinates("org.jboss.forge.addon:resources,2.0.0-SNAPSHOT");
       Assert.assertNull(addon.getApiVersion());
-      Assert.assertEquals("org.jboss.forge:resources", addon.getName());
+      Assert.assertEquals("org.jboss.forge.addon:resources", addon.getName());
       Assert.assertEquals(new SingleVersion("2.0.0-SNAPSHOT"), addon.getVersion());
    }
 
diff --git a/container-tests/pom.xml b/container-tests/pom.xml
index d047d6aae0..bc13bd4ef4 100644
--- a/container-tests/pom.xml
+++ b/container-tests/pom.xml
@@ -7,8 +7,10 @@
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
+
    <artifactId>furnace-tests</artifactId>
    <name>Furnace - Addon Container Tests</name>
+
    <dependencies>
       <dependency>
          <groupId>org.jboss.forge.furnace</groupId>
@@ -21,27 +23,27 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>example</artifactId>
          <classifier>forge-addon</classifier>
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>facets</artifactId>
          <classifier>forge-addon</classifier>
          <version>2.0.0-SNAPSHOT</version>
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources</artifactId>
          <classifier>forge-addon</classifier>
          <version>2.0.0-SNAPSHOT</version>
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>convert</artifactId>
          <classifier>forge-addon</classifier>
          <version>2.0.0-SNAPSHOT</version>
diff --git a/container-tests/src/test/java/org/jboss/forge/container/MultipleRepositoryTest.java b/container-tests/src/test/java/org/jboss/forge/container/MultipleRepositoryTest.java
index ff996fec71..2fa7ed8163 100644
--- a/container-tests/src/test/java/org/jboss/forge/container/MultipleRepositoryTest.java
+++ b/container-tests/src/test/java/org/jboss/forge/container/MultipleRepositoryTest.java
@@ -62,9 +62,9 @@ public void testAddonsCanReferenceDependenciesInOtherRepositories() throws IOExc
       AddonManager manager = new AddonManagerImpl(forge, new MavenDependencyResolver(new FileResourceFactory(),
                new MavenContainer()));
 
-      AddonId facets = AddonId.from("org.jboss.forge:facets", "2.0.0-SNAPSHOT");
-      AddonId convert = AddonId.from("org.jboss.forge:convert", "2.0.0-SNAPSHOT");
-      AddonId resources = AddonId.from("org.jboss.forge:resources", "2.0.0-SNAPSHOT");
+      AddonId facets = AddonId.from("org.jboss.forge.addon:facets", "2.0.0-SNAPSHOT");
+      AddonId convert = AddonId.from("org.jboss.forge.addon:convert", "2.0.0-SNAPSHOT");
+      AddonId resources = AddonId.from("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT");
 
       Assert.assertFalse(left.isDeployed(resources));
       Assert.assertFalse(left.isDeployed(facets));
@@ -99,9 +99,9 @@ public void testAddonsDontFailIfDuplicatedInOtherRepositories() throws IOExcepti
       AddonManager manager = new AddonManagerImpl(forge, new MavenDependencyResolver(new FileResourceFactory(),
                new MavenContainer()));
 
-      AddonId facets = AddonId.from("org.jboss.forge:facets", "2.0.0-SNAPSHOT");
-      AddonId convert = AddonId.from("org.jboss.forge:convert", "2.0.0-SNAPSHOT");
-      AddonId resources = AddonId.from("org.jboss.forge:resources", "2.0.0-SNAPSHOT");
+      AddonId facets = AddonId.from("org.jboss.forge.addon:facets", "2.0.0-SNAPSHOT");
+      AddonId convert = AddonId.from("org.jboss.forge.addon:convert", "2.0.0-SNAPSHOT");
+      AddonId resources = AddonId.from("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT");
 
       Assert.assertFalse(left.isDeployed(resources));
       Assert.assertFalse(left.isDeployed(facets));
diff --git a/convert/addon/pom.xml b/convert/addon/pom.xml
index b52d6bd54d..4570ac5669 100644
--- a/convert/addon/pom.xml
+++ b/convert/addon/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>convert-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
@@ -10,12 +10,12 @@
    <name>Forge - Convert Addon</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>convert-api</artifactId>
          <scope>compile</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>convert-impl</artifactId>
          <scope>runtime</scope>
       </dependency>
diff --git a/convert/api/pom.xml b/convert/api/pom.xml
index 41014187fa..b12218d167 100644
--- a/convert/api/pom.xml
+++ b/convert/api/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>convert-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
diff --git a/convert/impl/pom.xml b/convert/impl/pom.xml
index 1a68008b96..1e91fb5804 100644
--- a/convert/impl/pom.xml
+++ b/convert/impl/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>convert-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -14,7 +14,7 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>convert-api</artifactId>
       </dependency>
    </dependencies>
diff --git a/convert/pom.xml b/convert/pom.xml
index 739b52a0bc..04131faca7 100644
--- a/convert/pom.xml
+++ b/convert/pom.xml
@@ -6,9 +6,13 @@
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
+   
+   <groupId>org.jboss.forge.addon</groupId>
    <artifactId>convert-parent</artifactId>
+   
    <packaging>pom</packaging>
    <name>Forge - Convert Addon Parent</name>
+   
    <modules>
       <module>api</module>
       <module>impl</module>
@@ -18,18 +22,18 @@
    <dependencyManagement>
       <dependencies>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>convert</artifactId>
             <version>${project.version}</version>
             <classifier>forge-addon</classifier>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>convert-api</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>convert-impl</artifactId>
             <version>${project.version}</version>
          </dependency>
diff --git a/convert/tests/pom.xml b/convert/tests/pom.xml
index f521c29a25..fd7fdd1144 100644
--- a/convert/tests/pom.xml
+++ b/convert/tests/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>convert-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -9,7 +9,7 @@
    <name>Forge - Convert Addon Tests</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>convert</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
diff --git a/convert/tests/src/test/java/test/org/jboss/forge/convert/CDIConverterTest.java b/convert/tests/src/test/java/test/org/jboss/forge/convert/CDIConverterTest.java
index 5c799252af..881a7a5765 100644
--- a/convert/tests/src/test/java/test/org/jboss/forge/convert/CDIConverterTest.java
+++ b/convert/tests/src/test/java/test/org/jboss/forge/convert/CDIConverterTest.java
@@ -26,7 +26,7 @@
 public class CDIConverterTest
 {
    @Deployment
-   @Dependencies(@Addon(name = "org.jboss.forge:convert", version = "2.0.0-SNAPSHOT"))
+   @Dependencies(@Addon(name = "org.jboss.forge.addon:convert", version = "2.0.0-SNAPSHOT"))
    public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap
@@ -34,7 +34,7 @@ public static ForgeArchive getDeployment()
                .addBeansXML()
                .addClass(CDIConverterTest.class)
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:convert", "2.0.0-SNAPSHOT")));
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:convert", "2.0.0-SNAPSHOT")));
 
       return archive;
    }
diff --git a/dependencies/addon/pom.xml b/dependencies/addon/pom.xml
index 9b6cc90747..5b0a41da5e 100644
--- a/dependencies/addon/pom.xml
+++ b/dependencies/addon/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>dependencies-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
@@ -10,17 +10,17 @@
    <name>Forge - Dependencies Addon</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies-api</artifactId>
          <scope>compile</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies-impl</artifactId>
          <scope>runtime</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
diff --git a/dependencies/api/pom.xml b/dependencies/api/pom.xml
index 1e0803e0ca..b04d7c1d7d 100644
--- a/dependencies/api/pom.xml
+++ b/dependencies/api/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>dependencies-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -14,7 +14,7 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources-api</artifactId>
          <scope>provided</scope>
       </dependency>
diff --git a/dependencies/api/src/test/java/org/jboss/forge/addon/dependency/collection/DependencyNodeUtilTest.java b/dependencies/api/src/test/java/org/jboss/forge/addon/dependency/collection/DependencyNodeUtilTest.java
index e00bff4237..5a421a1411 100644
--- a/dependencies/api/src/test/java/org/jboss/forge/addon/dependency/collection/DependencyNodeUtilTest.java
+++ b/dependencies/api/src/test/java/org/jboss/forge/addon/dependency/collection/DependencyNodeUtilTest.java
@@ -22,17 +22,17 @@ public class DependencyNodeUtilTest
    public void testDepthFirstIterator()
    {
       DependencyNodeBuilder root = DependencyNodeBuilder.create(null, DependencyBuilder
-               .create("org.jboss.forge:example1:2.0.0-SNAPSHOT"));
+               .create("org.jboss.forge.addon:example1:2.0.0-SNAPSHOT"));
       DependencyNodeBuilder childOne = DependencyNodeBuilder.create(root,
-               DependencyBuilder.create("org.jboss.forge:example1-child-one:2.0.0-SNAPSHOT"));
+               DependencyBuilder.create("org.jboss.forge.addon:example1-child-one:2.0.0-SNAPSHOT"));
       DependencyNodeBuilder childTwo = DependencyNodeBuilder.create(root,
-               DependencyBuilder.create("org.jboss.forge:example1-child-two:2.0.0-SNAPSHOT"));
+               DependencyBuilder.create("org.jboss.forge.addon:example1-child-two:2.0.0-SNAPSHOT"));
 
       DependencyNodeBuilder childOneGrandChildOne = DependencyNodeBuilder.create(childOne,
-               DependencyBuilder.create("org.jboss.forge:example1-child-one-grandchild-one:2.0.0-SNAPSHOT"));
+               DependencyBuilder.create("org.jboss.forge.addon:example1-child-one-grandchild-one:2.0.0-SNAPSHOT"));
 
       DependencyNodeBuilder childOneGrandChildTwo = DependencyNodeBuilder.create(childOne,
-               DependencyBuilder.create("org.jboss.forge:example1-child-one-grandchild-two:2.0.0-SNAPSHOT"));
+               DependencyBuilder.create("org.jboss.forge.addon:example1-child-one-grandchild-two:2.0.0-SNAPSHOT"));
       childOne.getChildren().add(childOneGrandChildOne);
       childOne.getChildren().add(childOneGrandChildTwo);
 
@@ -65,17 +65,17 @@ public void testDepthFirstIterator()
    public void testBreadthFirstIterator()
    {
       DependencyNodeBuilder root = DependencyNodeBuilder.create(null, DependencyBuilder
-               .create("org.jboss.forge:example1:2.0.0-SNAPSHOT"));
+               .create("org.jboss.forge.addon:example1:2.0.0-SNAPSHOT"));
       DependencyNodeBuilder childOne = DependencyNodeBuilder.create(root,
-               DependencyBuilder.create("org.jboss.forge:example1-child-one:2.0.0-SNAPSHOT"));
+               DependencyBuilder.create("org.jboss.forge.addon:example1-child-one:2.0.0-SNAPSHOT"));
       DependencyNodeBuilder childTwo = DependencyNodeBuilder.create(root,
-               DependencyBuilder.create("org.jboss.forge:example1-child-two:2.0.0-SNAPSHOT"));
+               DependencyBuilder.create("org.jboss.forge.addon:example1-child-two:2.0.0-SNAPSHOT"));
 
       DependencyNodeBuilder childOneGrandChildOne = DependencyNodeBuilder.create(childOne,
-               DependencyBuilder.create("org.jboss.forge:example1-child-one-grandchild-one:2.0.0-SNAPSHOT"));
+               DependencyBuilder.create("org.jboss.forge.addon:example1-child-one-grandchild-one:2.0.0-SNAPSHOT"));
 
       DependencyNodeBuilder childOneGrandChildTwo = DependencyNodeBuilder.create(childOne,
-               DependencyBuilder.create("org.jboss.forge:example1-child-one-grandchild-two:2.0.0-SNAPSHOT"));
+               DependencyBuilder.create("org.jboss.forge.addon:example1-child-one-grandchild-two:2.0.0-SNAPSHOT"));
       childOne.getChildren().add(childOneGrandChildOne);
       childOne.getChildren().add(childOneGrandChildTwo);
 
@@ -108,17 +108,17 @@ public void testBreadthFirstIterator()
    public void testPreorderIterator()
    {
       DependencyNodeBuilder root = DependencyNodeBuilder.create(null, DependencyBuilder
-               .create("org.jboss.forge:example1:2.0.0-SNAPSHOT"));
+               .create("org.jboss.forge.addon:example1:2.0.0-SNAPSHOT"));
       DependencyNodeBuilder childOne = DependencyNodeBuilder.create(root,
-               DependencyBuilder.create("org.jboss.forge:example1-child-one:2.0.0-SNAPSHOT"));
+               DependencyBuilder.create("org.jboss.forge.addon:example1-child-one:2.0.0-SNAPSHOT"));
       DependencyNodeBuilder childTwo = DependencyNodeBuilder.create(root,
-               DependencyBuilder.create("org.jboss.forge:example1-child-two:2.0.0-SNAPSHOT"));
+               DependencyBuilder.create("org.jboss.forge.addon:example1-child-two:2.0.0-SNAPSHOT"));
 
       DependencyNodeBuilder childOneGrandChildOne = DependencyNodeBuilder.create(childOne,
-               DependencyBuilder.create("org.jboss.forge:example1-child-one-grandchild-one:2.0.0-SNAPSHOT"));
+               DependencyBuilder.create("org.jboss.forge.addon:example1-child-one-grandchild-one:2.0.0-SNAPSHOT"));
 
       DependencyNodeBuilder childOneGrandChildTwo = DependencyNodeBuilder.create(childOne,
-               DependencyBuilder.create("org.jboss.forge:example1-child-one-grandchild-two:2.0.0-SNAPSHOT"));
+               DependencyBuilder.create("org.jboss.forge.addon:example1-child-one-grandchild-two:2.0.0-SNAPSHOT"));
       childOne.getChildren().add(childOneGrandChildOne);
       childOne.getChildren().add(childOneGrandChildTwo);
 
diff --git a/dependencies/impl/pom.xml b/dependencies/impl/pom.xml
index 2b659d2371..cc28a86d43 100644
--- a/dependencies/impl/pom.xml
+++ b/dependencies/impl/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>dependencies-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -10,7 +10,7 @@
 
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies-api</artifactId>
       </dependency>
       <dependency>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index e25fb760a6..67dff3b3aa 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -6,30 +6,35 @@
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
+   
+   <groupId>org.jboss.forge.addon</groupId>
    <artifactId>dependencies-parent</artifactId>
+   
    <packaging>pom</packaging>
    <name>Forge - Dependencies Addon Parent</name>
+   
    <modules>
       <module>api</module>
       <module>impl</module>
       <module>addon</module>
       <module>tests</module>
    </modules>
+   
    <dependencyManagement>
       <dependencies>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>dependencies</artifactId>
             <version>${project.version}</version>
             <classifier>forge-addon</classifier>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>dependencies-api</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>dependencies-impl</artifactId>
             <version>${project.version}</version>
          </dependency>
diff --git a/dependencies/tests/pom.xml b/dependencies/tests/pom.xml
index 4366472f5c..772b453552 100644
--- a/dependencies/tests/pom.xml
+++ b/dependencies/tests/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>dependencies-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -9,7 +9,7 @@
    <name>Forge - Dependencies Addon Tests</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
diff --git a/environment/addon/pom.xml b/environment/addon/pom.xml
index b5e637b3e1..be1ef07f8b 100644
--- a/environment/addon/pom.xml
+++ b/environment/addon/pom.xml
@@ -1,21 +1,23 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>environment-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
+   
    <artifactId>environment</artifactId>
    <name>Forge - Environment Addon</name>
+   
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>environment-api</artifactId>
          <scope>compile</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>environment-impl</artifactId>
          <scope>runtime</scope>
       </dependency>
diff --git a/environment/api/pom.xml b/environment/api/pom.xml
index 49dbb8ca35..8161109d84 100644
--- a/environment/api/pom.xml
+++ b/environment/api/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>environment-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
diff --git a/environment/impl/pom.xml b/environment/impl/pom.xml
index 240a7e905a..0ed763c673 100644
--- a/environment/impl/pom.xml
+++ b/environment/impl/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>environment-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -14,7 +14,7 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>environment-api</artifactId>
       </dependency>
    </dependencies>
diff --git a/environment/pom.xml b/environment/pom.xml
index 9bb6fb0fc4..a1842c4a6a 100644
--- a/environment/pom.xml
+++ b/environment/pom.xml
@@ -6,24 +6,29 @@
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
+   
+   <groupId>org.jboss.forge.addon</groupId>
    <artifactId>environment-parent</artifactId>
+   
    <packaging>pom</packaging>
    <name>Forge - Environment Addon Parent</name>
+   
    <modules>
       <module>api</module>
       <module>impl</module>
       <module>addon</module>
       <module>tests</module>
    </modules>
+   
    <dependencyManagement>
       <dependencies>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>environment-api</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>environment-impl</artifactId>
             <version>${project.version}</version>
          </dependency>
diff --git a/environment/tests/pom.xml b/environment/tests/pom.xml
index 93ae216b6f..7723e9d2b1 100644
--- a/environment/tests/pom.xml
+++ b/environment/tests/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>environment-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -9,7 +9,7 @@
    <name>Forge - Environment Addon Tests</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>environment-impl</artifactId>
       </dependency>
       <dependency>
diff --git a/environment/tests/src/test/java/test/org/jboss/forge/environment/CDIEnvironmentTest.java b/environment/tests/src/test/java/test/org/jboss/forge/environment/CDIEnvironmentTest.java
index 71accaa629..cb323cdf7d 100644
--- a/environment/tests/src/test/java/test/org/jboss/forge/environment/CDIEnvironmentTest.java
+++ b/environment/tests/src/test/java/test/org/jboss/forge/environment/CDIEnvironmentTest.java
@@ -28,7 +28,7 @@
 public class CDIEnvironmentTest
 {
    @Deployment
-   @Dependencies(@Addon(name = "org.jboss.forge:environment", version = "2.0.0-SNAPSHOT"))
+   @Dependencies(@Addon(name = "org.jboss.forge.addon:environment", version = "2.0.0-SNAPSHOT"))
    public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap
@@ -36,7 +36,7 @@ public static ForgeArchive getDeployment()
                .addPackages(true, CDIEnvironmentTest.class.getPackage())
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:environment", "2.0.0-SNAPSHOT")));
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:environment", "2.0.0-SNAPSHOT")));
       return archive;
    }
 
diff --git a/facets/addon/pom.xml b/facets/addon/pom.xml
index b00653e2a6..9af7d25d81 100644
--- a/facets/addon/pom.xml
+++ b/facets/addon/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>facets-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
@@ -10,12 +10,12 @@
    <name>Forge - Facets Addon</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>facets-api</artifactId>
          <scope>compile</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>facets-impl</artifactId>
          <scope>runtime</scope>
       </dependency>
diff --git a/facets/api/pom.xml b/facets/api/pom.xml
index 34097a9cc9..d66f4e784a 100644
--- a/facets/api/pom.xml
+++ b/facets/api/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>facets-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
diff --git a/facets/impl/pom.xml b/facets/impl/pom.xml
index 507f3b540f..f45eedf6f1 100644
--- a/facets/impl/pom.xml
+++ b/facets/impl/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>facets-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
@@ -16,7 +16,7 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>facets-api</artifactId>
          <scope>provided</scope>
       </dependency>
diff --git a/facets/pom.xml b/facets/pom.xml
index 7f1f00d4b5..7b6124a13d 100644
--- a/facets/pom.xml
+++ b/facets/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.jboss.forge</groupId>
@@ -6,24 +7,29 @@
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
+
+   <groupId>org.jboss.forge.addon</groupId>
    <artifactId>facets-parent</artifactId>
+
    <packaging>pom</packaging>
    <name>Forge - Facets Addon Parent</name>
+
    <modules>
       <module>api</module>
       <module>impl</module>
       <module>addon</module>
       <module>tests</module>
    </modules>
+
    <dependencyManagement>
       <dependencies>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>facets-api</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>facets-impl</artifactId>
             <version>${project.version}</version>
          </dependency>
diff --git a/facets/tests/pom.xml b/facets/tests/pom.xml
index c3d5b8db63..25ebcc170d 100644
--- a/facets/tests/pom.xml
+++ b/facets/tests/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>facets-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
diff --git a/facets/tests/src/test/java/test/org/jboss/forge/facets/FacetFactoryTest.java b/facets/tests/src/test/java/test/org/jboss/forge/facets/FacetFactoryTest.java
index 7655055872..6ebb49aa75 100644
--- a/facets/tests/src/test/java/test/org/jboss/forge/facets/FacetFactoryTest.java
+++ b/facets/tests/src/test/java/test/org/jboss/forge/facets/FacetFactoryTest.java
@@ -30,7 +30,7 @@ public class FacetFactoryTest
 {
 
    @Deployment
-   @Dependencies(@Addon(name = "org.jboss.forge:facets", version = "2.0.0-SNAPSHOT"))
+   @Dependencies(@Addon(name = "org.jboss.forge.addon:facets", version = "2.0.0-SNAPSHOT"))
    public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap
@@ -43,7 +43,7 @@ public static ForgeArchive getDeployment()
                         NotFoundMockFacet.class,
                         TestQualifier.class)
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:facets", "2.0.0-SNAPSHOT")));
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:facets", "2.0.0-SNAPSHOT")));
       return archive;
    }
 
diff --git a/javaee/addon/pom.xml b/javaee/addon/pom.xml
index b5dbd9fbf5..e711f9fa65 100644
--- a/javaee/addon/pom.xml
+++ b/javaee/addon/pom.xml
@@ -3,7 +3,7 @@
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>javaee-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -16,26 +16,26 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>javaee-api</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>javaee-impl</artifactId>
          <scope>runtime</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>javaee-spi</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>projects</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>parser-java</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
diff --git a/javaee/api/pom.xml b/javaee/api/pom.xml
index 3acdcdb254..b76b5dea5c 100644
--- a/javaee/api/pom.xml
+++ b/javaee/api/pom.xml
@@ -3,7 +3,7 @@
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>javaee-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -16,19 +16,19 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>javaee-spi</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>projects</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>parser-java</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
diff --git a/javaee/impl/pom.xml b/javaee/impl/pom.xml
index 972e7f700f..01dca8f9ae 100644
--- a/javaee/impl/pom.xml
+++ b/javaee/impl/pom.xml
@@ -3,7 +3,7 @@
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>javaee-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -21,24 +21,24 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>javaee-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>javaee-spi</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>projects</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>parser-java</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
diff --git a/javaee/pom.xml b/javaee/pom.xml
index 1e06608984..25af7d6757 100644
--- a/javaee/pom.xml
+++ b/javaee/pom.xml
@@ -8,9 +8,13 @@
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
+   
+   <groupId>org.jboss.forge.addon</groupId>
    <artifactId>javaee-parent</artifactId>
+   
    <packaging>pom</packaging>
    <name>Forge - JavaEE Parent</name>
+   
    <modules>
       <module>addon</module>
       <module>api</module>
@@ -18,6 +22,7 @@
       <module>spi</module>
       <module>tests</module>
    </modules>
+   
    <properties>
       <shrinkwrap.descriptors.version>2.0.0-alpha-3</shrinkwrap.descriptors.version>
    </properties>
@@ -37,35 +42,35 @@
             <scope>import</scope>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>javaee</artifactId>
             <version>2.0.0-SNAPSHOT</version>
             <classifier>forge-addon</classifier>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>javaee-api</artifactId>
             <version>2.0.0-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>javaee-impl</artifactId>
             <version>2.0.0-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>javaee-spi</artifactId>
             <version>2.0.0-SNAPSHOT</version>
             <classifier>forge-addon</classifier>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>projects</artifactId>
             <version>2.0.0-SNAPSHOT</version>
             <classifier>forge-addon</classifier>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>parser-java</artifactId>
             <version>2.0.0-SNAPSHOT</version>
             <classifier>forge-addon</classifier>
diff --git a/javaee/spi/pom.xml b/javaee/spi/pom.xml
index 2415c21c53..a6bacac1e8 100644
--- a/javaee/spi/pom.xml
+++ b/javaee/spi/pom.xml
@@ -3,7 +3,7 @@
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>javaee-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
diff --git a/javaee/tests/pom.xml b/javaee/tests/pom.xml
index 20a6b48d99..9f2a510679 100644
--- a/javaee/tests/pom.xml
+++ b/javaee/tests/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>javaee-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -15,12 +15,12 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>projects</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>javaee</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
diff --git a/javaee/tests/src/test/java/test/org/jboss/forge/javaee/JavaEETestHelper.java b/javaee/tests/src/test/java/test/org/jboss/forge/javaee/JavaEETestHelper.java
index 9e4d66f450..6d8f4d2ba0 100644
--- a/javaee/tests/src/test/java/test/org/jboss/forge/javaee/JavaEETestHelper.java
+++ b/javaee/tests/src/test/java/test/org/jboss/forge/javaee/JavaEETestHelper.java
@@ -25,9 +25,9 @@ public abstract class JavaEETestHelper
 {
    @Deployment
    @Dependencies({
-            @Addon(name = "org.jboss.forge:projects", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:javaee", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:maven", version = "2.0.0-SNAPSHOT")
+            @Addon(name = "org.jboss.forge.addon:projects", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:javaee", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT")
    })
    public static ForgeArchive getDeployment()
    {
@@ -35,9 +35,9 @@ public static ForgeArchive getDeployment()
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:projects", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:javaee", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:maven", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:javaee", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:maven", "2.0.0-SNAPSHOT"))
                );
       return archive;
    }
diff --git a/javaee/tests/src/test/java/test/org/jboss/forge/javaee/cdi/CDIFacetTest.java b/javaee/tests/src/test/java/test/org/jboss/forge/javaee/cdi/CDIFacetTest.java
index e4de1dfd1d..d106062c2d 100644
--- a/javaee/tests/src/test/java/test/org/jboss/forge/javaee/cdi/CDIFacetTest.java
+++ b/javaee/tests/src/test/java/test/org/jboss/forge/javaee/cdi/CDIFacetTest.java
@@ -32,8 +32,8 @@ public class CDIFacetTest
 {
    @Deployment
    @Dependencies({
-            @Addon(name = "org.jboss.forge:javaee", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:maven", version = "2.0.0-SNAPSHOT")
+            @Addon(name = "org.jboss.forge.addon:javaee", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT")
    })
    public static ForgeArchive getDeployment()
    {
diff --git a/javaee/tests/src/test/java/test/org/jboss/forge/javaee/jpa/PersistenceFacetTest.java b/javaee/tests/src/test/java/test/org/jboss/forge/javaee/jpa/PersistenceFacetTest.java
index b8f8b4f043..c24ac04b7d 100644
--- a/javaee/tests/src/test/java/test/org/jboss/forge/javaee/jpa/PersistenceFacetTest.java
+++ b/javaee/tests/src/test/java/test/org/jboss/forge/javaee/jpa/PersistenceFacetTest.java
@@ -32,8 +32,8 @@ public class PersistenceFacetTest
 {
    @Deployment
    @Dependencies({
-            @Addon(name = "org.jboss.forge:javaee", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:maven", version = "2.0.0-SNAPSHOT")
+            @Addon(name = "org.jboss.forge.addon:javaee", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT")
    })
    public static ForgeArchive getDeployment()
    {
diff --git a/javaee/tests/src/test/java/test/org/jboss/forge/javaee/servlet/ServletFacetTest.java b/javaee/tests/src/test/java/test/org/jboss/forge/javaee/servlet/ServletFacetTest.java
index 8af5add369..7acaf8a258 100644
--- a/javaee/tests/src/test/java/test/org/jboss/forge/javaee/servlet/ServletFacetTest.java
+++ b/javaee/tests/src/test/java/test/org/jboss/forge/javaee/servlet/ServletFacetTest.java
@@ -34,9 +34,9 @@ public class ServletFacetTest
 {
    @Deployment
    @Dependencies({
-            @Addon(name = "org.jboss.forge:javaee", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:maven", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:projects", version = "2.0.0-SNAPSHOT")
+            @Addon(name = "org.jboss.forge.addon:javaee", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:projects", version = "2.0.0-SNAPSHOT")
    })
    public static ForgeArchive getDeployment()
    {
diff --git a/maven/addon/pom.xml b/maven/addon/pom.xml
index d40e3db09c..aba725f7ea 100644
--- a/maven/addon/pom.xml
+++ b/maven/addon/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>maven-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
@@ -10,51 +10,51 @@
    <name>Forge - Maven Addon</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>maven-api</artifactId>
          <scope>compile</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>maven-impl</artifactId>
          <scope>runtime</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>maven-impl-projects</artifactId>
          <scope>runtime</scope>
       </dependency>
 
       <!-- Addons -->
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>environment</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>projects</artifactId>
          <classifier>forge-addon</classifier>
          <optional>true</optional>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>parser-java</artifactId>
          <classifier>forge-addon</classifier>
          <optional>true</optional>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui</artifactId>
          <classifier>forge-addon</classifier>
          <optional>true</optional>
diff --git a/maven/api/pom.xml b/maven/api/pom.xml
index 0fc683008a..af98b721f5 100644
--- a/maven/api/pom.xml
+++ b/maven/api/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>maven-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -19,23 +19,23 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>environment-api</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>projects-api</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <scope>provided</scope>
diff --git a/maven/impl-projects/pom.xml b/maven/impl-projects/pom.xml
index 0ba2784701..a8f0736391 100644
--- a/maven/impl-projects/pom.xml
+++ b/maven/impl-projects/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>maven-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -14,11 +14,11 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>maven-api</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>maven-impl</artifactId>
       </dependency>
       <dependency>
@@ -38,35 +38,35 @@
       </dependency>
 
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>environment-api</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>projects-api</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui-api</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>parser-java-api</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <scope>provided</scope>
diff --git a/maven/impl/pom.xml b/maven/impl/pom.xml
index 62d598270c..8f30cb0485 100644
--- a/maven/impl/pom.xml
+++ b/maven/impl/pom.xml
@@ -1,12 +1,15 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>maven-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
+
    <artifactId>maven-impl</artifactId>
    <name>Forge - Maven Impl</name>
+
    <dependencies>
       <dependency>
          <groupId>org.jboss.forge.furnace</groupId>
@@ -17,9 +20,9 @@
          <groupId>org.jboss.forge</groupId>
          <artifactId>forge-parser-xml</artifactId>
       </dependency>
-      
+
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>maven-api</artifactId>
       </dependency>
       <!-- ShrinkWrap Resolver -->
@@ -28,12 +31,12 @@
          <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies-api</artifactId>
          <scope>provided</scope>
       </dependency>
diff --git a/maven/pom.xml b/maven/pom.xml
index 4d9c48e392..c4d0aa47ab 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -6,9 +6,13 @@
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
+   
+   <groupId>org.jboss.forge.addon</groupId>
    <artifactId>maven-parent</artifactId>
+   
    <packaging>pom</packaging>
    <name>Forge - Maven Addon Parent</name>
+   
    <modules>
       <module>api</module>
       <module>impl</module>
@@ -24,58 +28,58 @@
    <dependencyManagement>
       <dependencies>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>maven</artifactId>
             <classifier>forge-addon</classifier>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>maven-api</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>maven-impl</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>maven-impl-projects</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>environment</artifactId>
             <version>2.0.0-SNAPSHOT</version>
             <classifier>forge-addon</classifier>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>resources</artifactId>
             <version>2.0.0-SNAPSHOT</version>
             <classifier>forge-addon</classifier>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>dependencies</artifactId>
             <version>2.0.0-SNAPSHOT</version>
             <classifier>forge-addon</classifier>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>parser-java</artifactId>
             <version>2.0.0-SNAPSHOT</version>
             <classifier>forge-addon</classifier>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>projects</artifactId>
             <version>2.0.0-SNAPSHOT</version>
             <classifier>forge-addon</classifier>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>ui</artifactId>
             <version>2.0.0-SNAPSHOT</version>
             <classifier>forge-addon</classifier>
diff --git a/maven/tests/pom.xml b/maven/tests/pom.xml
index c7e42a35dd..4c51804dfe 100644
--- a/maven/tests/pom.xml
+++ b/maven/tests/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>maven-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -9,12 +9,12 @@
    <name>Forge - Maven Addon Tests</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>maven</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>projects</artifactId>
          <classifier>forge-addon</classifier>
          <version>2.0.0-SNAPSHOT</version>
diff --git a/maven/tests/src/test/java/org/jboss/forge/maven/MavenMultiModuleProviderTest.java b/maven/tests/src/test/java/org/jboss/forge/maven/MavenMultiModuleProviderTest.java
index 79b00230cf..820c04dbf2 100644
--- a/maven/tests/src/test/java/org/jboss/forge/maven/MavenMultiModuleProviderTest.java
+++ b/maven/tests/src/test/java/org/jboss/forge/maven/MavenMultiModuleProviderTest.java
@@ -35,10 +35,10 @@ public class MavenMultiModuleProviderTest
 {
    @Deployment
    @Dependencies({
-            @Addon(name = "org.jboss.forge:resources", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:projects", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:ui", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:maven", version = "2.0.0-SNAPSHOT")
+            @Addon(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:projects", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:ui", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT")
    })
    public static ForgeArchive getDeployment()
    {
@@ -46,8 +46,8 @@ public static ForgeArchive getDeployment()
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:maven", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:projects", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:maven", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT"))
                );
 
       return archive;
diff --git a/maven/tests/src/test/java/org/jboss/forge/maven/MavenProjectLocatorTest.java b/maven/tests/src/test/java/org/jboss/forge/maven/MavenProjectLocatorTest.java
index ca335d196c..5ac393fd58 100644
--- a/maven/tests/src/test/java/org/jboss/forge/maven/MavenProjectLocatorTest.java
+++ b/maven/tests/src/test/java/org/jboss/forge/maven/MavenProjectLocatorTest.java
@@ -41,9 +41,9 @@ public class MavenProjectLocatorTest
 {
    @Deployment
    @Dependencies({
-            @Addon(name = "org.jboss.forge:resources", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:projects", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:maven", version = "2.0.0-SNAPSHOT")
+            @Addon(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:projects", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT")
    })
    public static ForgeArchive getDeployment()
    {
@@ -53,8 +53,8 @@ public static ForgeArchive getDeployment()
                         "org/jboss/forge/maven/pom-template.xml")
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:maven", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:projects", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:maven", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT"))
                );
 
       return archive;
diff --git a/maven/tests/src/test/java/org/jboss/forge/maven/MavenWebResourceFacetTest.java b/maven/tests/src/test/java/org/jboss/forge/maven/MavenWebResourceFacetTest.java
index b6a6a41a97..4aedddc180 100644
--- a/maven/tests/src/test/java/org/jboss/forge/maven/MavenWebResourceFacetTest.java
+++ b/maven/tests/src/test/java/org/jboss/forge/maven/MavenWebResourceFacetTest.java
@@ -35,8 +35,8 @@ public class MavenWebResourceFacetTest
 
    @Deployment
    @Dependencies({
-            @Addon(name = "org.jboss.forge:projects", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:maven", version = "2.0.0-SNAPSHOT")
+            @Addon(name = "org.jboss.forge.addon:projects", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT")
    })
    public static ForgeArchive getDeployment()
    {
@@ -44,8 +44,8 @@ public static ForgeArchive getDeployment()
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:maven", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:projects", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:maven", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT"))
                );
 
       return archive;
diff --git a/maven/tests/src/test/java/org/jboss/forge/maven/projects/facets/MavenPackagingFacetTest.java b/maven/tests/src/test/java/org/jboss/forge/maven/projects/facets/MavenPackagingFacetTest.java
index ec10d48feb..cf18754ce6 100644
--- a/maven/tests/src/test/java/org/jboss/forge/maven/projects/facets/MavenPackagingFacetTest.java
+++ b/maven/tests/src/test/java/org/jboss/forge/maven/projects/facets/MavenPackagingFacetTest.java
@@ -32,9 +32,9 @@ public class MavenPackagingFacetTest
 
    @Deployment
    @Dependencies({
-            @Addon(name = "org.jboss.forge:resources", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:projects", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:maven", version = "2.0.0-SNAPSHOT")
+            @Addon(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:projects", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT")
    })
    public static ForgeArchive getDeployment()
    {
@@ -42,8 +42,8 @@ public static ForgeArchive getDeployment()
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:maven", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:projects", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:maven", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT"))
                );
 
       return archive;
diff --git a/parser-java/addon/pom.xml b/parser-java/addon/pom.xml
index 2056cbdb55..cd66b6ff1f 100644
--- a/parser-java/addon/pom.xml
+++ b/parser-java/addon/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>parser-java-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
@@ -10,31 +10,31 @@
    <name>Forge - Java Parser Addon</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>parser-java-api</artifactId>
          <scope>compile</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>parser-java-impl</artifactId>
          <scope>runtime</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
          <optional>true</optional>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>projects</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
          <optional>true</optional>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui-hints</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
diff --git a/parser-java/api/pom.xml b/parser-java/api/pom.xml
index d65dae33b5..c4a4fae205 100644
--- a/parser-java/api/pom.xml
+++ b/parser-java/api/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>parser-java-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
@@ -10,10 +10,6 @@
    <name>Forge - Java Parser Addon API</name>
 
    <dependencies>
-      <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>java-parser-api</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.jboss.forge.furnace</groupId>
          <artifactId>furnace-api</artifactId>
@@ -21,11 +17,15 @@
       </dependency>
       <dependency>
          <groupId>org.jboss.forge</groupId>
+         <artifactId>java-parser-api</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>projects-api</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <scope>provided</scope>
diff --git a/parser-java/impl/pom.xml b/parser-java/impl/pom.xml
index 10680cbbc5..bde110b04b 100644
--- a/parser-java/impl/pom.xml
+++ b/parser-java/impl/pom.xml
@@ -1,16 +1,23 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>parser-java-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
+   
    <artifactId>parser-java-impl</artifactId>
    <name>Forge - Java Parser Addon Implementation</name>
+   
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.furnace</groupId>
+         <artifactId>furnace-api</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>parser-java-api</artifactId>
       </dependency>
       <dependency>
@@ -18,17 +25,12 @@
          <artifactId>java-parser-impl</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge.furnace</groupId>
-         <artifactId>furnace-api</artifactId>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui-hints</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
diff --git a/parser-java/pom.xml b/parser-java/pom.xml
index e8518c42cc..447d97a669 100644
--- a/parser-java/pom.xml
+++ b/parser-java/pom.xml
@@ -6,9 +6,13 @@
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
+   
+   <groupId>org.jboss.forge.addon</groupId>
    <artifactId>parser-java-parent</artifactId>
+   
    <packaging>pom</packaging>
    <name>Forge - Java Parser Addon Parent</name>
+   
    <modules>
       <module>api</module>
       <module>impl</module>
@@ -23,12 +27,12 @@
    <dependencyManagement>
       <dependencies>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>parser-java-api</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>parser-java-impl</artifactId>
             <version>${project.version}</version>
          </dependency>
diff --git a/parser-java/tests/pom.xml b/parser-java/tests/pom.xml
index 3a217dacb9..d6cc30cf93 100644
--- a/parser-java/tests/pom.xml
+++ b/parser-java/tests/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>parser-java-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -9,19 +9,19 @@
    <name>Forge - Java Parser Addon Tests</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>parser-java</artifactId>
          <classifier>forge-addon</classifier>
          <version>2.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources</artifactId>
          <classifier>forge-addon</classifier>
          <version>2.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui-hints</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
diff --git a/parser-java/tests/src/test/java/test/org/jboss/forge/parser/java/JavaParserResourcesTest.java b/parser-java/tests/src/test/java/test/org/jboss/forge/parser/java/JavaParserResourcesTest.java
index c7e6f0b072..b56216e34e 100644
--- a/parser-java/tests/src/test/java/test/org/jboss/forge/parser/java/JavaParserResourcesTest.java
+++ b/parser-java/tests/src/test/java/test/org/jboss/forge/parser/java/JavaParserResourcesTest.java
@@ -32,16 +32,16 @@ public class JavaParserResourcesTest
 {
    @Deployment
    @Dependencies({
-            @Addon(name = "org.jboss.forge:resources", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:parser-java", version = "2.0.0-SNAPSHOT")
+            @Addon(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:parser-java", version = "2.0.0-SNAPSHOT")
    })
    public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:parser-java", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:resources", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:parser-java", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT"))
                );
 
       return archive;
diff --git a/parser-java/tests/src/test/java/test/org/jboss/forge/parser/java/JavaSourceFactoryTest.java b/parser-java/tests/src/test/java/test/org/jboss/forge/parser/java/JavaSourceFactoryTest.java
index 6579615adc..2a20392c96 100644
--- a/parser-java/tests/src/test/java/test/org/jboss/forge/parser/java/JavaSourceFactoryTest.java
+++ b/parser-java/tests/src/test/java/test/org/jboss/forge/parser/java/JavaSourceFactoryTest.java
@@ -28,14 +28,14 @@ public class JavaSourceFactoryTest
 {
    @Deployment
    @Dependencies({
-            @Addon(name = "org.jboss.forge:parser-java", version = "2.0.0-SNAPSHOT")
+            @Addon(name = "org.jboss.forge.addon:parser-java", version = "2.0.0-SNAPSHOT")
    })
    public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:parser-java", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:parser-java", "2.0.0-SNAPSHOT"))
                );
 
       return archive;
diff --git a/parser-java/tests/src/test/java/test/org/jboss/forge/parser/java/hints/ParserHintsTest.java b/parser-java/tests/src/test/java/test/org/jboss/forge/parser/java/hints/ParserHintsTest.java
index a1d1aa34a3..3e70356d8f 100644
--- a/parser-java/tests/src/test/java/test/org/jboss/forge/parser/java/hints/ParserHintsTest.java
+++ b/parser-java/tests/src/test/java/test/org/jboss/forge/parser/java/hints/ParserHintsTest.java
@@ -30,20 +30,20 @@
 public class ParserHintsTest
 {
    @Deployment
-   @Dependencies({ @Addon(name = "org.jboss.forge:ui-hints", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:environment", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:resources", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:parser-java", version = "2.0.0-SNAPSHOT") })
+   @Dependencies({ @Addon(name = "org.jboss.forge.addon:ui-hints", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:environment", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:parser-java", version = "2.0.0-SNAPSHOT") })
    public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:resources", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:ui-hints", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:parser-java", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:environment", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:ui-hints", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:parser-java", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:environment", "2.0.0-SNAPSHOT"))
                );
 
       return archive;
diff --git a/pom.xml b/pom.xml
index a089692c99..613c3b2fc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,6 +149,16 @@
             <version>${version.javassist}</version>
             <scope>compile</scope>
          </dependency>
+         <dependency>
+            <groupId>org.jboss.forge</groupId>
+            <artifactId>forge-bootstrap</artifactId>
+            <version>${project.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.jboss.forge</groupId>
+            <artifactId>forge-parser-xml</artifactId>
+            <version>${project.version}</version>
+         </dependency>
          
          
          <!-- Test Harneses Dependencies -->
@@ -251,57 +261,47 @@
 
          <!-- Forge Dependencies -->
          <dependency>
-            <groupId>org.jboss.forge</groupId>
-            <artifactId>forge-bootstrap</artifactId>
-            <version>${project.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>addon-manager</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>addon-manager-impl</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
-            <artifactId>forge-parser-xml</artifactId>
-            <version>${project.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>dependencies-api</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>dependencies-impl</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>maven-api</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>maven-impl</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>resources-api</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>resources-impl</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>example</artifactId>
             <version>${project.version}</version>
             <classifier>forge-addon</classifier>
@@ -590,7 +590,7 @@
                      <!-- <ignore></ignore> -->
                   </ignores>
                   <excludes>
-                     <exclude>org/jboss/forge/**/*.class</exclude>
+                     <exclude>org.jboss.forge.addon/**/*.class</exclude>
                   </excludes>
                </instrumentation>
             </configuration>
diff --git a/projects/addon/pom.xml b/projects/addon/pom.xml
index 370540681a..08c6f25c1c 100644
--- a/projects/addon/pom.xml
+++ b/projects/addon/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>projects-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
@@ -10,31 +10,31 @@
    <name>Forge - Projects Addon</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
          <optional>true</optional>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>projects-api</artifactId>
          <scope>compile</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>projects-impl</artifactId>
          <scope>runtime</scope>
       </dependency>
diff --git a/projects/api/pom.xml b/projects/api/pom.xml
index bdbb81581c..d8b52f0624 100644
--- a/projects/api/pom.xml
+++ b/projects/api/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>projects-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -15,17 +15,17 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui-api</artifactId>
          <scope>provided</scope>
          <version>2.0.0-SNAPSHOT</version>
diff --git a/projects/api/src/main/java/org/jboss/forge/projects/facets/DependencyFacet.java b/projects/api/src/main/java/org/jboss/forge/projects/facets/DependencyFacet.java
index 060f43133b..d341dca065 100644
--- a/projects/api/src/main/java/org/jboss/forge/projects/facets/DependencyFacet.java
+++ b/projects/api/src/main/java/org/jboss/forge/projects/facets/DependencyFacet.java
@@ -251,10 +251,10 @@ public interface DependencyFacet extends ProjectFacet
     * {@link DependencyRepository} instances for this {@link Project}. By default, SNAPSHOT versions are excluded. For
     * example:
     * <p>
-    * <code>dependencyFacet.resolveAvailableVersions("org.jboss.forge:example:[1.0.0,]");</code><br>
-    * <code>dependencyFacet.resolveAvailableVersions("org.jboss.forge:example:[1.0.0,)");</code><br>
-    * <code>dependencyFacet.resolveAvailableVersions("org.jboss.forge:example:(1.0.0,3.0.0]");</code><br>
-    * <code>dependencyFacet.resolveAvailableVersions("org.jboss.forge:example:[1.0.0,3.0.0]");</code>
+    * <code>dependencyFacet.resolveAvailableVersions("org.jboss.forge.addon:example:[1.0.0,]");</code><br>
+    * <code>dependencyFacet.resolveAvailableVersions("org.jboss.forge.addon:example:[1.0.0,)");</code><br>
+    * <code>dependencyFacet.resolveAvailableVersions("org.jboss.forge.addon:example:(1.0.0,3.0.0]");</code><br>
+    * <code>dependencyFacet.resolveAvailableVersions("org.jboss.forge.addon:example:[1.0.0,3.0.0]");</code>
     * <p>
     * For more comprehensive resolution features, see {@link #resolveAvailableVersions(DependencyQuery)} or
     * {@link DependencyResolver}
diff --git a/projects/impl/pom.xml b/projects/impl/pom.xml
index d3ad9ea21a..73b01b1483 100644
--- a/projects/impl/pom.xml
+++ b/projects/impl/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>projects-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -9,7 +9,7 @@
    <name>Forge - Projects Impl</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>projects-api</artifactId>
       </dependency>
       <dependency>
@@ -19,30 +19,30 @@
       </dependency>
 
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>convert-api</artifactId>
          <scope>provided</scope>
          <version>2.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>dependencies-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>facets-api</artifactId>
          <scope>provided</scope>
          <version>2.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui-api</artifactId>
          <scope>provided</scope>
          <version>2.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources-api</artifactId>
          <scope>provided</scope>
       </dependency>
diff --git a/projects/pom.xml b/projects/pom.xml
index 3e47904042..220a49b03b 100644
--- a/projects/pom.xml
+++ b/projects/pom.xml
@@ -6,30 +6,35 @@
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
+   
+   <groupId>org.jboss.forge.addon</groupId>
    <artifactId>projects-parent</artifactId>
+   
    <packaging>pom</packaging>
    <name>Forge - Projects Addon Parent</name>
+   
    <modules>
       <module>api</module>
       <module>impl</module>
       <module>addon</module>
       <module>tests</module>
    </modules>
+   
    <dependencyManagement>
       <dependencies>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>projects</artifactId>
             <classifier>forge-addon</classifier>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>projects-api</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>projects-impl</artifactId>
             <version>${project.version}</version>
          </dependency>
diff --git a/projects/tests/pom.xml b/projects/tests/pom.xml
index 5b87ddcc51..5d93a09a74 100644
--- a/projects/tests/pom.xml
+++ b/projects/tests/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>projects-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -9,30 +9,30 @@
    <name>Forge - Projects Addon Tests</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>projects</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>aesh</artifactId>
          <classifier>forge-addon</classifier>
          <version>2.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>aesh-test-harness</artifactId>
          <classifier>forge-addon</classifier>
          <version>2.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui</artifactId>
          <classifier>forge-addon</classifier>
          <version>2.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>maven</artifactId>
          <classifier>forge-addon</classifier>
          <version>2.0.0-SNAPSHOT</version>
diff --git a/projects/tests/src/test/java/org/jboss/forge/projects/aesh/NewProjectAeshTest.java b/projects/tests/src/test/java/org/jboss/forge/projects/aesh/NewProjectAeshTest.java
index 0412b31c74..52cedfde11 100644
--- a/projects/tests/src/test/java/org/jboss/forge/projects/aesh/NewProjectAeshTest.java
+++ b/projects/tests/src/test/java/org/jboss/forge/projects/aesh/NewProjectAeshTest.java
@@ -27,12 +27,12 @@
 public class NewProjectAeshTest
 {
    @Deployment
-   @Dependencies({ @Addon(name = "org.jboss.forge:ui", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:aesh-test-harness", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:aesh", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:maven", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:resources", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:projects", version = "2.0.0-SNAPSHOT")
+   @Dependencies({ @Addon(name = "org.jboss.forge.addon:ui", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:aesh-test-harness", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:aesh", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:projects", version = "2.0.0-SNAPSHOT")
    })
    public static ForgeArchive getDeployment()
    {
@@ -40,11 +40,11 @@ public static ForgeArchive getDeployment()
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:ui", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:projects", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:aesh", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:aesh-test-harness", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:resources", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:ui", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:aesh", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:aesh-test-harness", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT"))
                );
 
       return archive;
diff --git a/projects/tests/src/test/java/org/jboss/forge/projects/impl/DependencyInstallerImplTest.java b/projects/tests/src/test/java/org/jboss/forge/projects/impl/DependencyInstallerImplTest.java
index 63a6107c87..3dc6f920ad 100644
--- a/projects/tests/src/test/java/org/jboss/forge/projects/impl/DependencyInstallerImplTest.java
+++ b/projects/tests/src/test/java/org/jboss/forge/projects/impl/DependencyInstallerImplTest.java
@@ -37,10 +37,10 @@ public class DependencyInstallerImplTest
 {
    @Deployment
    @Dependencies({
-            @Addon(name = "org.jboss.forge:resources", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:projects", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:ui", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:maven", version = "2.0.0-SNAPSHOT")
+            @Addon(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:projects", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:ui", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT")
    })
    public static ForgeArchive getDeployment()
    {
@@ -48,8 +48,8 @@ public static ForgeArchive getDeployment()
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:maven", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:projects", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:maven", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT"))
                );
 
       return archive;
diff --git a/projects/tests/src/test/java/org/jboss/forge/projects/impl/NewProjectWizardTest.java b/projects/tests/src/test/java/org/jboss/forge/projects/impl/NewProjectWizardTest.java
index 7617e18aaf..21403efe02 100644
--- a/projects/tests/src/test/java/org/jboss/forge/projects/impl/NewProjectWizardTest.java
+++ b/projects/tests/src/test/java/org/jboss/forge/projects/impl/NewProjectWizardTest.java
@@ -39,8 +39,8 @@ public class NewProjectWizardTest
 {
    @Deployment
    @Dependencies({
-            @Addon(name = "org.jboss.forge:projects", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:ui", version = "2.0.0-SNAPSHOT")
+            @Addon(name = "org.jboss.forge.addon:projects", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:ui", version = "2.0.0-SNAPSHOT")
    })
    public static ForgeArchive getDeployment()
    {
@@ -48,9 +48,9 @@ public static ForgeArchive getDeployment()
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:resources", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:projects", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:ui", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:ui", "2.0.0-SNAPSHOT"))
                );
 
       return archive;
diff --git a/projects/tests/src/test/java/org/jboss/forge/projects/impl/ProjectFactoryImplTest.java b/projects/tests/src/test/java/org/jboss/forge/projects/impl/ProjectFactoryImplTest.java
index 9fdb70cda1..b66a2fd35a 100644
--- a/projects/tests/src/test/java/org/jboss/forge/projects/impl/ProjectFactoryImplTest.java
+++ b/projects/tests/src/test/java/org/jboss/forge/projects/impl/ProjectFactoryImplTest.java
@@ -36,10 +36,10 @@ public class ProjectFactoryImplTest
 {
    @Deployment
    @Dependencies({
-            @Addon(name = "org.jboss.forge:resources", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:projects", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:ui", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:maven", version = "2.0.0-SNAPSHOT")
+            @Addon(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:projects", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:ui", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT")
    })
    public static ForgeArchive getDeployment()
    {
@@ -47,8 +47,8 @@ public static ForgeArchive getDeployment()
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:maven", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:projects", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:maven", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT"))
                );
 
       return archive;
diff --git a/proxy-tests/pom.xml b/proxy-tests/pom.xml
index 0ebab96fc3..5d08718a65 100644
--- a/proxy-tests/pom.xml
+++ b/proxy-tests/pom.xml
@@ -32,13 +32,6 @@
          <scope>test</scope>
       </dependency>
 
-      <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>ui-example</artifactId>
-         <version>${project.version}</version>
-         <classifier>forge-addon</classifier>
-         <scope>test</scope>
-      </dependency>
       <dependency>
          <groupId>org.jboss.forge.test</groupId>
          <artifactId>forge-test-harness</artifactId>
@@ -49,5 +42,12 @@
          <artifactId>arquillian-forge-classpath</artifactId>
          <scope>test</scope>
       </dependency>
+      <dependency>
+         <groupId>org.jboss.forge.addon</groupId>
+         <artifactId>ui-example</artifactId>
+         <version>${project.version}</version>
+         <classifier>forge-addon</classifier>
+         <scope>test</scope>
+      </dependency>
    </dependencies>
 </project>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index fcc8e30882..9d526e8e6a 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -19,13 +19,13 @@
    <name>Furnace - Proxy Utilities</name>
 
    <dependencies>
-      <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-javassist</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.jboss.forge.furnace</groupId>
          <artifactId>furnace-api</artifactId>
       </dependency>
+      <dependency>
+         <groupId>org.jboss.forge</groupId>
+         <artifactId>forge-javassist</artifactId>
+      </dependency>
    </dependencies>
 </project>
diff --git a/resources/addon/pom.xml b/resources/addon/pom.xml
index 2c2cfc469c..55d3a56d44 100644
--- a/resources/addon/pom.xml
+++ b/resources/addon/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>resources-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
@@ -10,32 +10,32 @@
    <name>Forge - Resource Addon</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>facets</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>convert</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
          <optional>true</optional>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui-hints</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
          <optional>true</optional>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources-api</artifactId>
          <scope>compile</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources-impl</artifactId>
          <scope>runtime</scope>
       </dependency>
diff --git a/resources/api/pom.xml b/resources/api/pom.xml
index 5c14db197e..9cf8c32448 100644
--- a/resources/api/pom.xml
+++ b/resources/api/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>resources-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
@@ -10,7 +10,7 @@
    <name>Forge - Resource Addon API</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>facets</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
diff --git a/resources/impl/pom.xml b/resources/impl/pom.xml
index 9de194c230..46d013d296 100644
--- a/resources/impl/pom.xml
+++ b/resources/impl/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>resources-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
@@ -10,17 +10,17 @@
    <name>Forge - Resource Addon Impl</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources-api</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>convert</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui-hints</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
diff --git a/resources/pom.xml b/resources/pom.xml
index 3ef68f4b52..bdf38afc55 100644
--- a/resources/pom.xml
+++ b/resources/pom.xml
@@ -6,9 +6,13 @@
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
+   
+   <groupId>org.jboss.forge.addon</groupId>
    <artifactId>resources-parent</artifactId>
+   
    <packaging>pom</packaging>
    <name>Forge - Resource Addon Parent</name>
+   
    <modules>
       <module>api</module>
       <module>impl</module>
@@ -18,18 +22,18 @@
    <dependencyManagement>
       <dependencies>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>resources</artifactId>
             <classifier>forge-addon</classifier>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>resources-api</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>resources-impl</artifactId>
             <version>${project.version}</version>
          </dependency>
diff --git a/resources/tests/pom.xml b/resources/tests/pom.xml
index ddd619913f..cdfc616a4a 100644
--- a/resources/tests/pom.xml
+++ b/resources/tests/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>resources-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -9,12 +9,12 @@
    <name>Forge - Resources Addon Tests</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources</artifactId>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui-hints</artifactId>
          <classifier>forge-addon</classifier>
          <version>2.0.0-SNAPSHOT</version>
diff --git a/resources/tests/src/test/java/test/org/jboss/forge/convert/ResourceConverterTest.java b/resources/tests/src/test/java/test/org/jboss/forge/convert/ResourceConverterTest.java
index d028246cda..9bbeeb9c37 100644
--- a/resources/tests/src/test/java/test/org/jboss/forge/convert/ResourceConverterTest.java
+++ b/resources/tests/src/test/java/test/org/jboss/forge/convert/ResourceConverterTest.java
@@ -29,8 +29,8 @@
 public class ResourceConverterTest
 {
    @Deployment
-   @Dependencies({ @Addon(name = "org.jboss.forge:convert", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:resources", version = "2.0.0-SNAPSHOT") })
+   @Dependencies({ @Addon(name = "org.jboss.forge.addon:convert", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT") })
    public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap
@@ -38,8 +38,8 @@ public static ForgeArchive getDeployment()
                .addBeansXML()
                .addClass(ResourceConverterTest.class)
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:resources", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:convert", "2.0.0-SNAPSHOT")));
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:convert", "2.0.0-SNAPSHOT")));
 
       return archive;
    }
diff --git a/resources/tests/src/test/java/test/org/jboss/forge/hints/ResourceHintsTest.java b/resources/tests/src/test/java/test/org/jboss/forge/hints/ResourceHintsTest.java
index d3c2291751..97a11267de 100644
--- a/resources/tests/src/test/java/test/org/jboss/forge/hints/ResourceHintsTest.java
+++ b/resources/tests/src/test/java/test/org/jboss/forge/hints/ResourceHintsTest.java
@@ -30,17 +30,17 @@
 public class ResourceHintsTest
 {
    @Deployment
-   @Dependencies({ @Addon(name = "org.jboss.forge:ui-hints", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:environment", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:resources", version = "2.0.0-SNAPSHOT") })
+   @Dependencies({ @Addon(name = "org.jboss.forge.addon:ui-hints", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:environment", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT") })
    public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:resources", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:ui-hints", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:ui-hints", "2.0.0-SNAPSHOT"))
                );
 
       return archive;
diff --git a/resources/tests/src/test/java/test/org/jboss/forge/resource/FileResourceGeneratorTest.java b/resources/tests/src/test/java/test/org/jboss/forge/resource/FileResourceGeneratorTest.java
index cf2cd94244..0188ac2f0e 100644
--- a/resources/tests/src/test/java/test/org/jboss/forge/resource/FileResourceGeneratorTest.java
+++ b/resources/tests/src/test/java/test/org/jboss/forge/resource/FileResourceGeneratorTest.java
@@ -34,15 +34,15 @@ public class FileResourceGeneratorTest
 {
    @Deployment
    @Dependencies({
-            @Addon(name = "org.jboss.forge:facets", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:resources", version = "2.0.0-SNAPSHOT") })
+            @Addon(name = "org.jboss.forge.addon:facets", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT") })
    public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:facets", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:resources", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:facets", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT"))
                );
 
       return archive;
diff --git a/resources/tests/src/test/java/test/org/jboss/forge/resource/ResourceGeneratorAddonTest.java b/resources/tests/src/test/java/test/org/jboss/forge/resource/ResourceGeneratorAddonTest.java
index d49e993ba3..c0fca929ef 100644
--- a/resources/tests/src/test/java/test/org/jboss/forge/resource/ResourceGeneratorAddonTest.java
+++ b/resources/tests/src/test/java/test/org/jboss/forge/resource/ResourceGeneratorAddonTest.java
@@ -22,14 +22,14 @@
 public class ResourceGeneratorAddonTest
 {
    @Deployment(order = 1)
-   @Dependencies({ @Addon(name = "org.jboss.forge:resources", version = "2.0.0-SNAPSHOT") })
+   @Dependencies({ @Addon(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT") })
    public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:resources", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT")),
                         AddonDependencyEntry.create(AddonId.from("mockstring", "1")));
 
       return archive;
@@ -42,7 +42,7 @@ public static ForgeArchive getAddonDeployment()
                .addClasses(MockStringResource.class, MockStringResourceGenerator.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:resources", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT"))
                );
 
       return archive;
diff --git a/resources/tests/src/test/java/test/org/jboss/forge/resource/URLResourceGeneratorTest.java b/resources/tests/src/test/java/test/org/jboss/forge/resource/URLResourceGeneratorTest.java
index 13209c6ebd..5bf51bb565 100644
--- a/resources/tests/src/test/java/test/org/jboss/forge/resource/URLResourceGeneratorTest.java
+++ b/resources/tests/src/test/java/test/org/jboss/forge/resource/URLResourceGeneratorTest.java
@@ -33,15 +33,15 @@ public class URLResourceGeneratorTest
 {
    @Deployment
    @Dependencies({
-            @Addon(name = "org.jboss.forge:facets", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:resources", version = "2.0.0-SNAPSHOT") })
+            @Addon(name = "org.jboss.forge.addon:facets", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT") })
    public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:facets", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:resources", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:facets", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT"))
                );
 
       return archive;
diff --git a/resources/tests/src/test/java/test/org/jboss/forge/resource/transaction/TransactionalFileResourceGeneratorTest.java b/resources/tests/src/test/java/test/org/jboss/forge/resource/transaction/TransactionalFileResourceGeneratorTest.java
index 9ae718f5c0..b07df7c6bf 100644
--- a/resources/tests/src/test/java/test/org/jboss/forge/resource/transaction/TransactionalFileResourceGeneratorTest.java
+++ b/resources/tests/src/test/java/test/org/jboss/forge/resource/transaction/TransactionalFileResourceGeneratorTest.java
@@ -38,15 +38,15 @@ public class TransactionalFileResourceGeneratorTest
 {
    @Deployment
    @Dependencies({
-            @Addon(name = "org.jboss.forge:facets", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:resources", version = "2.0.0-SNAPSHOT") })
+            @Addon(name = "org.jboss.forge.addon:facets", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT") })
    public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:facets", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:resources", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:facets", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT"))
                );
 
       return archive;
diff --git a/ui-hints/pom.xml b/ui-hints/pom.xml
index a889737aca..716f420049 100644
--- a/ui-hints/pom.xml
+++ b/ui-hints/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.jboss.forge</groupId>
@@ -6,17 +7,21 @@
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
+   
+   <groupId>org.jboss.forge.addon</groupId>
    <artifactId>ui-hints</artifactId>
+   
    <name>Forge - UI Addon Input Hints</name>
+   
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>environment</artifactId>
          <classifier>forge-addon</classifier>
          <version>2.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>facets</artifactId>
          <classifier>forge-addon</classifier>
          <version>2.0.0-SNAPSHOT</version>
diff --git a/ui/addon/pom.xml b/ui/addon/pom.xml
index 44ae8b4b5b..64c8f9385c 100644
--- a/ui/addon/pom.xml
+++ b/ui/addon/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>ui-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
@@ -10,29 +10,29 @@
    <name>Forge - UI Addon</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui-api</artifactId>
          <scope>compile</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui-impl</artifactId>
          <scope>runtime</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>convert</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>facets</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui-hints</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
diff --git a/ui/api/pom.xml b/ui/api/pom.xml
index 6f1a50bd83..67dd242f98 100644
--- a/ui/api/pom.xml
+++ b/ui/api/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>ui-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -16,19 +16,19 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>convert-api</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>facets-api</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui-hints</artifactId>
          <classifier>forge-addon</classifier>
          <version>2.0.0-SNAPSHOT</version>
diff --git a/ui/example/pom.xml b/ui/example/pom.xml
index 6baba126a9..569dbbfb9c 100644
--- a/ui/example/pom.xml
+++ b/ui/example/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>ui-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -15,13 +15,13 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>resources</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
diff --git a/ui/impl/pom.xml b/ui/impl/pom.xml
index 3db1cf0ac6..603f79de45 100644
--- a/ui/impl/pom.xml
+++ b/ui/impl/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>ui-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -16,19 +16,19 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui-api</artifactId>
       </dependency>
 
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>convert-api</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <scope>provided</scope>
       </dependency>
 
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui-hints</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
diff --git a/ui/pom.xml b/ui/pom.xml
index 5f96eb92e2..4d997296df 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -6,9 +6,13 @@
       <version>2.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
+   
+   <groupId>org.jboss.forge.addon</groupId>
    <artifactId>ui-parent</artifactId>
+   
    <packaging>pom</packaging>
    <name>Forge - UI Addon Parent</name>
+   
    <modules>
       <module>api</module>
       <module>impl</module>
@@ -16,15 +20,16 @@
       <module>tests</module>
       <module>example</module>
    </modules>
+   
    <dependencyManagement>
       <dependencies>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>ui-api</artifactId>
             <version>${project.version}</version>
          </dependency>
          <dependency>
-            <groupId>org.jboss.forge</groupId>
+            <groupId>org.jboss.forge.addon</groupId>
             <artifactId>ui-impl</artifactId>
             <version>${project.version}</version>
          </dependency>
diff --git a/ui/tests/pom.xml b/ui/tests/pom.xml
index 142b5a5a28..60d8d580ff 100644
--- a/ui/tests/pom.xml
+++ b/ui/tests/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.jboss.forge</groupId>
+      <groupId>org.jboss.forge.addon</groupId>
       <artifactId>ui-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
@@ -9,7 +9,7 @@
    <name>Forge - UI Addon Tests</name>
    <dependencies>
       <dependency>
-         <groupId>org.jboss.forge</groupId>
+         <groupId>org.jboss.forge.addon</groupId>
          <artifactId>ui</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <classifier>forge-addon</classifier>
diff --git a/ui/tests/src/test/java/org/jboss/forge/ui/UIWizardDiscoveryTest.java b/ui/tests/src/test/java/org/jboss/forge/ui/UIWizardDiscoveryTest.java
index 239e6297f1..8ffa674ecc 100644
--- a/ui/tests/src/test/java/org/jboss/forge/ui/UIWizardDiscoveryTest.java
+++ b/ui/tests/src/test/java/org/jboss/forge/ui/UIWizardDiscoveryTest.java
@@ -26,14 +26,14 @@
 public class UIWizardDiscoveryTest
 {
    @Deployment
-   @Dependencies(@Addon(name = "org.jboss.forge:ui", version = "2.0.0-SNAPSHOT"))
+   @Dependencies(@Addon(name = "org.jboss.forge.addon:ui", version = "2.0.0-SNAPSHOT"))
    public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap
                .create(ForgeArchive.class)
                .addClasses(MyFirstWizard.class)
                .addBeansXML()
-               .addAsAddonDependencies(AddonDependencyEntry.create(AddonId.from("org.jboss.forge:ui", "2.0.0-SNAPSHOT")));
+               .addAsAddonDependencies(AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:ui", "2.0.0-SNAPSHOT")));
 
       return archive;
    }
diff --git a/ui/tests/src/test/java/org/jboss/forge/ui/impl/ManyValuesInjectionTest.java b/ui/tests/src/test/java/org/jboss/forge/ui/impl/ManyValuesInjectionTest.java
index 3cae9db0d6..6de427c8a4 100644
--- a/ui/tests/src/test/java/org/jboss/forge/ui/impl/ManyValuesInjectionTest.java
+++ b/ui/tests/src/test/java/org/jboss/forge/ui/impl/ManyValuesInjectionTest.java
@@ -34,8 +34,8 @@
 public class ManyValuesInjectionTest
 {
    @Deployment
-   @Dependencies({ @Addon(name = "org.jboss.forge:ui", version = "2.0.0-SNAPSHOT"),
-            @Addon(name = "org.jboss.forge:convert", version = "2.0.0-SNAPSHOT") })
+   @Dependencies({ @Addon(name = "org.jboss.forge.addon:ui", version = "2.0.0-SNAPSHOT"),
+            @Addon(name = "org.jboss.forge.addon:convert", version = "2.0.0-SNAPSHOT") })
    public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap
@@ -43,8 +43,8 @@ public static ForgeArchive getDeployment()
                .addBeansXML()
                .addClasses(Career.class)
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:convert", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:ui", "2.0.0-SNAPSHOT")));
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:convert", "2.0.0-SNAPSHOT")),
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:ui", "2.0.0-SNAPSHOT")));
 
       return archive;
    }
diff --git a/ui/tests/src/test/java/org/jboss/forge/ui/impl/UIInputInjectionDispirateTypesTest.java b/ui/tests/src/test/java/org/jboss/forge/ui/impl/UIInputInjectionDispirateTypesTest.java
index f09e740bc0..a47bedafc3 100644
--- a/ui/tests/src/test/java/org/jboss/forge/ui/impl/UIInputInjectionDispirateTypesTest.java
+++ b/ui/tests/src/test/java/org/jboss/forge/ui/impl/UIInputInjectionDispirateTypesTest.java
@@ -27,12 +27,12 @@
 public class UIInputInjectionDispirateTypesTest
 {
    @Deployment
-   @Dependencies(@Addon(name = "org.jboss.forge:ui", version = "2.0.0-SNAPSHOT"))
+   @Dependencies(@Addon(name = "org.jboss.forge.addon:ui", version = "2.0.0-SNAPSHOT"))
    public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
                .addBeansXML()
-               .addAsAddonDependencies(AddonDependencyEntry.create(AddonId.from("org.jboss.forge:ui", "2.0.0-SNAPSHOT")));
+               .addAsAddonDependencies(AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:ui", "2.0.0-SNAPSHOT")));
 
       return archive;
    }
diff --git a/ui/tests/src/test/java/org/jboss/forge/ui/impl/UIInputInjectionTest.java b/ui/tests/src/test/java/org/jboss/forge/ui/impl/UIInputInjectionTest.java
index 8b613d1022..998c9039bc 100644
--- a/ui/tests/src/test/java/org/jboss/forge/ui/impl/UIInputInjectionTest.java
+++ b/ui/tests/src/test/java/org/jboss/forge/ui/impl/UIInputInjectionTest.java
@@ -40,7 +40,7 @@
 public class UIInputInjectionTest
 {
    @Deployment
-   @Dependencies(@Addon(name = "org.jboss.forge:ui", version = "2.0.0-SNAPSHOT"))
+   @Dependencies(@Addon(name = "org.jboss.forge.addon:ui", version = "2.0.0-SNAPSHOT"))
    public static ForgeArchive getDeployment()
    {
       ForgeArchive archive = ShrinkWrap
@@ -48,7 +48,7 @@ public static ForgeArchive getDeployment()
                .addBeansXML()
                .addClasses(Career.class)
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge:ui", "2.0.0-SNAPSHOT")));
+                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:ui", "2.0.0-SNAPSHOT")));
 
       return archive;
    }