diff --git a/README.md b/README.md
index 71e0abc..6342a20 100644
--- a/README.md
+++ b/README.md
@@ -14,12 +14,11 @@ Currently it supports:
 * Ability for portlet containers to add extra deployments into the runtime container prior to deployment of the test archive
 * `@PortalTest` marker annotation on test class to allow special processing by container specific implementations
 
-On it's own this extension doesn't do much, so you will need a portlet container specific implementation of this extension
-to use it. Implementations for GateIn and Pluto portlet containers can be found at
-[Portlet Bridge](http://github.com/portletbridge).
+As part of the extension we provide implementations for the following portlet containers:
+* GateIn
 
 ### Code example
---- 
+---
 
     @RunWith(Arquillian.class)
     @PortalTest
diff --git a/impl-gatein/.gitignore b/impl-gatein/.gitignore
deleted file mode 100644
index be9baef..0000000
--- a/impl-gatein/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.project
-.classpath
-.settings
-.idea
-*.iml
-target
-
diff --git a/impl-gatein/README.md b/impl-gatein/README.md
deleted file mode 100644
index c68d0c8..0000000
--- a/impl-gatein/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## GateIn Extension for Arquillian
-
-### What is this?
-
-The **GateIn Extension** is an implementation of the [Arquillian Extension for Portals](https://github.com/arquillian/arquillian-extension-portal)
-that enables the GateIn Portlet Container to be used on different containers for testing portlets.
-
-Using **GateIn Extension** in your project for testing requires that a version of pc-embed be added as a dependency so that this extension can access it.
-For that, we need the following dependency:
-
-    <dependency>
-        <groupId>org.gatein.pc</groupId>
-        <artifactId>pc-embed</artifactId>
-        <version>2.4.0.Final</version>
-    </dependency>
diff --git a/impl-gatein/gatein-arquillian-extension/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/impl-gatein/gatein-arquillian-extension/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
deleted file mode 100644
index c105bae..0000000
--- a/impl-gatein/gatein-arquillian-extension/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
+++ /dev/null
@@ -1 +0,0 @@
-org.gatein.pc.arquillian.GateInPortalExtension
\ No newline at end of file
diff --git a/impl-gatein/pom.xml b/impl-gatein/pom.xml
deleted file mode 100644
index 626ed62..0000000
--- a/impl-gatein/pom.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <!-- Parent -->
-    <parent>
-        <groupId>org.jboss</groupId>
-        <artifactId>jboss-parent</artifactId>
-        <version>8</version>
-    </parent>
-
-    <!-- Model Version -->
-    <modelVersion>4.0.0</modelVersion>
-
-    <!-- Artifact Configuration -->
-    <groupId>org.jboss.portletbridge.testing.gatein</groupId>
-    <artifactId>gatein-testing-parent</artifactId>
-    <version>1.0.0.Final-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>GateIn Testing, parent pom</name>
-    <description>Provides deployable WAR of GateIn Portal Container for testing portlets</description>
-
-    <properties>
-        <!-- Testing versions -->
-        <version.junit>4.10</version.junit>
-        <version.arquillian>1.0.3.Final</version.arquillian>
-        <version.shrinkwrap.resolver>2.0.0-alpha-7</version.shrinkwrap.resolver>
-        <version.arquillian.portal.extension>1.0.0.Beta1</version.arquillian.portal.extension>
-
-        <!-- Plugin versions -->
-        <version.plugin.surefire>2.12</version.plugin.surefire>
-
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <developers>
-        <developer>
-            <name>Ken Finnigan</name>
-            <timezone>UTC+5</timezone>
-            <email>ken@kenfinnigan.me</email>
-        </developer>
-    </developers>
-
-    <issueManagement>
-        <system>jira</system>
-        <url>https://issues.jboss.org/browse/PBR/component/12315779</url>
-    </issueManagement>
-
-    <scm>
-        <connection>scm:git:git@github.com:portletbridge/gatein-testing.git</connection>
-        <developerConnection>scm:git:git@github.com:portletbridge/gatein-testing.git</developerConnection>
-        <url>https://github.com/portletbridge/gatein-testing</url>
-    </scm>
-
-    <!-- Modules -->
-    <modules>
-        <module>gatein-arquillian-extension</module>
-    </modules>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${version.plugin.surefire}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
-        <plugins>
-            <!-- Enforce Maven Environment -->
-            <plugin>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>enforce-maven-environment</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <rules>
-                        <requireMavenVersion>
-                            <version>[3.0.4,)</version>
-                        </requireMavenVersion>
-                        <requireJavaVersion>
-                            <version>1.6.0</version> <!-- Must be JDK6 -->
-                        </requireJavaVersion>
-                        <requireProperty>
-                            <property>env.JAVA_HOME</property>
-                            <message>"JAVA_HOME needs to be set to compile"</message>
-                        </requireProperty>
-                    </rules>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-release-plugin</artifactId>
-                <configuration>
-                    <autoVersionSubmodules>true</autoVersionSubmodules>
-                    <pushChanges>false</pushChanges>
-                    <localCheckout>true</localCheckout>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- Spec dependencies -->
-            <dependency>
-                <groupId>javax.portlet</groupId>
-                <artifactId>portlet-api</artifactId>
-                <version>2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>2.5</version>
-            </dependency>
-
-            <!-- Test dependencies -->
-            <dependency>
-                <groupId>org.jboss.shrinkwrap.resolver</groupId>
-                <artifactId>shrinkwrap-resolver-bom</artifactId>
-                <version>${version.shrinkwrap.resolver}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.arquillian</groupId>
-                <artifactId>arquillian-bom</artifactId>
-                <version>${version.arquillian}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>${version.junit}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.arquillian.extension</groupId>
-                <artifactId>arquillian-portal-spi</artifactId>
-                <version>${version.arquillian.portal.extension}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>
-
diff --git a/pom.xml b/pom.xml
index f186776..803ef7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,7 @@
         <module>portal/api</module>
         <module>portal/spi</module>
         <module>portal/impl/impl-base</module>
+        <module>portal/impl/impl-gatein</module>
         <module>portal/depchain</module>
     </modules>
 
@@ -78,6 +79,22 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.jboss.arquillian.extension</groupId>
+                <artifactId>arquillian-portal-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.arquillian.extension</groupId>
+                <artifactId>arquillian-portal-spi</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.arquillian.extension</groupId>
+                <artifactId>arquillian-portal-impl-base</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>javax.portlet</groupId>
                 <artifactId>portlet-api</artifactId>
diff --git a/impl-gatein/gatein-arquillian-extension/pom.xml b/portal/impl/impl-gatein/pom.xml
similarity index 71%
rename from impl-gatein/gatein-arquillian-extension/pom.xml
rename to portal/impl/impl-gatein/pom.xml
index 02a9949..23ff078 100644
--- a/impl-gatein/gatein-arquillian-extension/pom.xml
+++ b/portal/impl/impl-gatein/pom.xml
@@ -3,18 +3,19 @@
 
     <!-- Parent -->
     <parent>
-        <groupId>org.jboss.portletbridge.testing.gatein</groupId>
-        <artifactId>gatein-testing-parent</artifactId>
-        <version>1.0.0.Final-SNAPSHOT</version>
+        <groupId>org.jboss.arquillian.extension</groupId>
+        <artifactId>arquillian-portal-parent</artifactId>
+        <version>1.1.0.Final-SNAPSHOT</version>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <!-- Model Version -->
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Artifact Configuration -->
-    <artifactId>gatein-arquillian-extension</artifactId>
+    <artifactId>arquillian-portal-impl-gatein</artifactId>
     <packaging>jar</packaging>
-    <name>GateIn Arquillian Extension</name>
+    <name>Arquillian Portal Extension Implementation for GateIn</name>
 
     <dependencies>
         <dependency>
@@ -36,12 +37,6 @@
             <groupId>org.jboss.shrinkwrap.descriptors</groupId>
             <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/impl-gatein/gatein-arquillian-extension/src/main/java/org/gatein/pc/arquillian/GateInPortalExtension.java b/portal/impl/impl-gatein/src/main/java/org/jboss/arquillian/portal/impl/gatein/GateInPortalExtension.java
similarity index 86%
rename from impl-gatein/gatein-arquillian-extension/src/main/java/org/gatein/pc/arquillian/GateInPortalExtension.java
rename to portal/impl/impl-gatein/src/main/java/org/jboss/arquillian/portal/impl/gatein/GateInPortalExtension.java
index 8cbfbce..ca9b452 100644
--- a/impl-gatein/gatein-arquillian-extension/src/main/java/org/gatein/pc/arquillian/GateInPortalExtension.java
+++ b/portal/impl/impl-gatein/src/main/java/org/jboss/arquillian/portal/impl/gatein/GateInPortalExtension.java
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat, Inc., and individual contributors
+ * Copyright 2013, Red Hat, Inc., and individual contributors
  * as indicated by the @author tags. See the copyright.txt file in the
  * distribution for a full listing of individual contributors.
  *
@@ -19,12 +19,12 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.gatein.pc.arquillian;
+package org.jboss.arquillian.portal.impl.gatein;
 
-import org.gatein.pc.arquillian.deployment.GateInDeploymentEnricher;
-import org.gatein.pc.arquillian.enricher.resource.GateInURLProvider;
 import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
 import org.jboss.arquillian.core.spi.LoadableExtension;
+import org.jboss.arquillian.portal.impl.gatein.deployment.GateInDeploymentEnricher;
+import org.jboss.arquillian.portal.impl.gatein.enricher.resource.GateInURLProvider;
 import org.jboss.arquillian.portal.spi.enricher.resource.PortalURLProvider;
 
 /**
diff --git a/impl-gatein/gatein-arquillian-extension/src/main/java/org/gatein/pc/arquillian/deployment/GateInDeploymentEnricher.java b/portal/impl/impl-gatein/src/main/java/org/jboss/arquillian/portal/impl/gatein/deployment/GateInDeploymentEnricher.java
similarity index 97%
rename from impl-gatein/gatein-arquillian-extension/src/main/java/org/gatein/pc/arquillian/deployment/GateInDeploymentEnricher.java
rename to portal/impl/impl-gatein/src/main/java/org/jboss/arquillian/portal/impl/gatein/deployment/GateInDeploymentEnricher.java
index f8e0926..73abc76 100644
--- a/impl-gatein/gatein-arquillian-extension/src/main/java/org/gatein/pc/arquillian/deployment/GateInDeploymentEnricher.java
+++ b/portal/impl/impl-gatein/src/main/java/org/jboss/arquillian/portal/impl/gatein/deployment/GateInDeploymentEnricher.java
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat, Inc., and individual contributors
+ * Copyright 2013, Red Hat, Inc., and individual contributors
  * as indicated by the @author tags. See the copyright.txt file in the
  * distribution for a full listing of individual contributors.
  *
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gatein.pc.arquillian.deployment;
+package org.jboss.arquillian.portal.impl.gatein.deployment;
 
 import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
 import org.jboss.arquillian.portal.api.PortalTest;
diff --git a/impl-gatein/gatein-arquillian-extension/src/main/java/org/gatein/pc/arquillian/enricher/resource/GateInURLProvider.java b/portal/impl/impl-gatein/src/main/java/org/jboss/arquillian/portal/impl/gatein/enricher/resource/GateInURLProvider.java
similarity index 90%
rename from impl-gatein/gatein-arquillian-extension/src/main/java/org/gatein/pc/arquillian/enricher/resource/GateInURLProvider.java
rename to portal/impl/impl-gatein/src/main/java/org/jboss/arquillian/portal/impl/gatein/enricher/resource/GateInURLProvider.java
index d388087..3381bb3 100644
--- a/impl-gatein/gatein-arquillian-extension/src/main/java/org/gatein/pc/arquillian/enricher/resource/GateInURLProvider.java
+++ b/portal/impl/impl-gatein/src/main/java/org/jboss/arquillian/portal/impl/gatein/enricher/resource/GateInURLProvider.java
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat, Inc., and individual contributors
+ * Copyright 2013, Red Hat, Inc., and individual contributors
  * as indicated by the @author tags. See the copyright.txt file in the
  * distribution for a full listing of individual contributors.
  *
@@ -19,13 +19,13 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.gatein.pc.arquillian.enricher.resource;
+package org.jboss.arquillian.portal.impl.gatein.enricher.resource;
 
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
 
-import org.gatein.pc.arquillian.deployment.GateInDeploymentEnricher;
+import org.jboss.arquillian.portal.impl.gatein.deployment.GateInDeploymentEnricher;
 import org.jboss.arquillian.portal.spi.enricher.resource.PortalURLProvider;
 
 /**
diff --git a/portal/impl/impl-gatein/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/portal/impl/impl-gatein/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
new file mode 100644
index 0000000..ce1e661
--- /dev/null
+++ b/portal/impl/impl-gatein/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
@@ -0,0 +1 @@
+org.jboss.arquillian.portal.impl.gatein.GateInPortalExtension
\ No newline at end of file