diff --git abiquo/pom.xml abiquo/pom.xml
index 231ac6c..7d2d272 100644
--- abiquo/pom.xml
+++ abiquo/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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
@@ -31,12 +31,12 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
         </dependency>
@@ -93,27 +93,27 @@
         </dependency>
         <!-- Test dependencies -->
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-slf4j</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
diff --git azure-management/pom.xml azure-management/pom.xml
index d7b0e84..a3c4c4d 100644
--- azure-management/pom.xml
+++ azure-management/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>azure-management</artifactId>
   <name>jcloud azure-management api</name>
   <description>jclouds components to access an implementation of Azure Management</description>
@@ -57,32 +57,32 @@
       <version>0.4</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-sshj</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>
diff --git carrenza-vcloud-director/pom.xml carrenza-vcloud-director/pom.xml
index 99f88cf..e983d2c 100644
--- carrenza-vcloud-director/pom.xml
+++ carrenza-vcloud-director/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>carrenza-vcloud-director</artifactId>
     <name>jclouds Carrenza vCloud Director provider</name>
     <description>vCloud Director implementation targeted to Carrenza</description>
@@ -59,39 +59,39 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>vcloud-director</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>vcloud-director</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-log4j</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
diff --git cdmi/pom.xml cdmi/pom.xml
index a54f8ce..36bd304 100644
--- cdmi/pom.xml
+++ cdmi/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.api -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>cdmi</artifactId>
   <name>jcloud cdmi api</name>
   <description>jclouds components to access an implementation of SNIA CDMI</description>
@@ -55,26 +55,26 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-blobstore</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-blobstore</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>
diff --git cloudstack-ec2/pom.xml cloudstack-ec2/pom.xml
index abf6b26..dbd8422 100644
--- cloudstack-ec2/pom.xml
+++ cloudstack-ec2/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.api -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>cloudstack-ec2</artifactId>
   <name>jclouds CloudStack EC2 api</name>
   <description>EC2 implementation based on CloudStack</description>
@@ -53,39 +53,39 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>ec2</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>ec2</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-log4j</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-sshj</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
diff --git dmtf/pom.xml dmtf/pom.xml
index 589bb51..6b24cf3 100644
--- dmtf/pom.xml
+++ dmtf/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: consider merging this with vcloud-director as it is not used anywhere else -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>dmtf</artifactId>
   <name>jclouds dmtf domain objects</name>
   <description>jclouds implementation of DMTF OVF and CIM domain objects</description>
@@ -45,7 +45,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
diff --git fgcp-au/pom.xml fgcp-au/pom.xml
index 33f6080..e472083 100644
--- fgcp-au/pom.xml
+++ fgcp-au/pom.xml
@@ -22,13 +22,13 @@
 <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.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>fgcp-au</artifactId>
     <name>jclouds Fujitsu Global Cloud Platform AU provider</name>
     <description>jclouds components to access Fujitsu Global Cloud Platform in Australia</description>
@@ -70,31 +70,31 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-log4j</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
@@ -111,12 +111,12 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>fgcp</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>fgcp</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
diff --git fgcp-de/pom.xml fgcp-de/pom.xml
index 22624cd..b6a1777 100644
--- fgcp-de/pom.xml
+++ fgcp-de/pom.xml
@@ -22,13 +22,13 @@
 <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.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>fgcp-de</artifactId>
     <name>jclouds Fujitsu Global Cloud Platform DE provider</name>
     <description>jclouds components to access Fujitsu Global Cloud Platform in Germany</description>
@@ -70,31 +70,31 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-log4j</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
@@ -111,12 +111,12 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>fgcp</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>fgcp</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
diff --git fgcp/pom.xml fgcp/pom.xml
index 8864505..d7479f1 100644
--- fgcp/pom.xml
+++ fgcp/pom.xml
@@ -22,13 +22,13 @@
 <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.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.api -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>fgcp</artifactId>
     <name>jclouds Fujitsu Global Cloud Platform</name>
     <description>jclouds components to access Fujitsu Global Cloud Platform</description>
@@ -71,31 +71,31 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-log4j</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
diff --git greenqloud-compute/pom.xml greenqloud-compute/pom.xml
index d9b27cc..d224f12 100644
--- greenqloud-compute/pom.xml
+++ greenqloud-compute/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>greenqloud-compute</artifactId>
     <name>jclouds Greenqloud compute provider</name>
     <description>Compute implementation targeted to Greenqloud Web Services</description>
@@ -54,39 +54,39 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.api</groupId>
+            <groupId>org.apache.jclouds.api</groupId>
             <artifactId>ec2</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.api</groupId>
+            <groupId>org.apache.jclouds.api</groupId>
             <artifactId>ec2</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-log4j</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
diff --git greenqloud-storage/pom.xml greenqloud-storage/pom.xml
index 3898281..4d77c5c 100644
--- greenqloud-storage/pom.xml
+++ greenqloud-storage/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>greenqloud-storage</artifactId>
     <name>jclouds GreenQloud Simple Storage Service (S3) provider</name>
     <description>Simple Storage Service (S3) implementation targeted to GreenQloud Web Services</description>
@@ -49,33 +49,33 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.api</groupId>
+            <groupId>org.apache.jclouds.api</groupId>
             <artifactId>s3</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-blobstore</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.api</groupId>
+            <groupId>org.apache.jclouds.api</groupId>
             <artifactId>s3</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-log4j</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
diff --git jclouds-management/management-blobstore/pom.xml jclouds-management/management-blobstore/pom.xml
index a4fe530..2003855 100644
--- jclouds-management/management-blobstore/pom.xml
+++ jclouds-management/management-blobstore/pom.xml
@@ -23,12 +23,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>jclouds-management</artifactId>
-        <groupId>org.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jclouds.labs.management</groupId>
+    <groupId>org.apache.jclouds.labs.management</groupId>
     <artifactId>management-blobstore</artifactId>
     <packaging>bundle</packaging>
     <name>jclouds :: management :: blobstore</name>
@@ -44,19 +44,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-blobstore</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.jclouds.labs.representations</groupId>
+            <groupId>org.apache.jclouds.labs.representations</groupId>
             <artifactId>representations-codec</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.jclouds.labs.management</groupId>
+            <groupId>org.apache.jclouds.labs.management</groupId>
             <artifactId>management-core</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git jclouds-management/management-compute/pom.xml jclouds-management/management-compute/pom.xml
index c746d7c..e48024a 100644
--- jclouds-management/management-compute/pom.xml
+++ jclouds-management/management-compute/pom.xml
@@ -23,12 +23,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>jclouds-management</artifactId>
-        <groupId>org.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jclouds.labs.management</groupId>
+    <groupId>org.apache.jclouds.labs.management</groupId>
     <artifactId>management-compute</artifactId>
     <packaging>bundle</packaging>
     <name>jclouds :: management :: compute</name>
@@ -44,19 +44,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.jclouds.labs.representations</groupId>
+            <groupId>org.apache.jclouds.labs.representations</groupId>
             <artifactId>representations-codec</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.jclouds.labs.management</groupId>
+            <groupId>org.apache.jclouds.labs.management</groupId>
             <artifactId>management-core</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git jclouds-management/management-core/pom.xml jclouds-management/management-core/pom.xml
index 64028f5..cec511c 100644
--- jclouds-management/management-core/pom.xml
+++ jclouds-management/management-core/pom.xml
@@ -23,12 +23,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>jclouds-management</artifactId>
-        <groupId>org.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jclouds.labs.management</groupId>
+    <groupId>org.apache.jclouds.labs.management</groupId>
     <artifactId>management-core</artifactId>
     <packaging>bundle</packaging>
     <name>jclouds :: management :: core</name>
@@ -45,12 +45,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.labs.representations</groupId>
+            <groupId>org.apache.jclouds.labs.representations</groupId>
             <artifactId>representations-codec</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -73,7 +73,7 @@
         </dependency>
         <!-- Testing Dependencies -->
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
diff --git jclouds-management/pom.xml jclouds-management/pom.xml
index b359df5..6d6c851 100644
--- jclouds-management/pom.xml
+++ jclouds-management/pom.xml
@@ -23,12 +23,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>jclouds-labs</artifactId>
-        <groupId>org.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-management</artifactId>
     <packaging>pom</packaging>
     <name>jclouds :: management</name>
diff --git jclouds-representations/pom.xml jclouds-representations/pom.xml
index 8625819..42079b6 100644
--- jclouds-representations/pom.xml
+++ jclouds-representations/pom.xml
@@ -24,12 +24,12 @@ under the License.
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>jclouds-labs</artifactId>
-        <groupId>org.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-represetations</artifactId>
     <packaging>pom</packaging>
     <name>jclouds :: represetations</name>
diff --git jclouds-representations/representations-codec/pom.xml jclouds-representations/representations-codec/pom.xml
index c15d11b..83f14d8 100644
--- jclouds-representations/representations-codec/pom.xml
+++ jclouds-representations/representations-codec/pom.xml
@@ -23,14 +23,14 @@ under the License.
          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">
     <parent>
-        <groupId>org.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-represetations</artifactId>
         <version>1.7.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jclouds.labs.representations</groupId>
+    <groupId>org.apache.jclouds.labs.representations</groupId>
     <artifactId>representations-codec</artifactId>
     <packaging>bundle</packaging>
     <name>jclouds :: representations :: codec</name>
@@ -50,25 +50,25 @@ under the License.
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.labs.representations</groupId>
+            <groupId>org.apache.jclouds.labs.representations</groupId>
             <artifactId>representations-core</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-blobstore</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -80,7 +80,7 @@ under the License.
         </dependency>
 
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
diff --git jclouds-representations/representations-core/pom.xml jclouds-representations/representations-core/pom.xml
index 5ed5640..d18ca7f 100644
--- jclouds-representations/representations-core/pom.xml
+++ jclouds-representations/representations-core/pom.xml
@@ -23,14 +23,14 @@ under the License.
          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">
     <parent>
-        <groupId>org.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-represetations</artifactId>
         <version>1.7.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jclouds.labs.representations</groupId>
+    <groupId>org.apache.jclouds.labs.representations</groupId>
     <artifactId>representations-core</artifactId>
     <name>jclouds :: representations :: core</name>
     <packaging>bundle</packaging>
@@ -55,7 +55,7 @@ under the License.
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
diff --git jenkins/pom.xml jenkins/pom.xml
index de4e84b..d1cea07 100644
--- jenkins/pom.xml
+++ jenkins/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.api -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>jenkins</artifactId>
   <name>jcloud jenkins api</name>
   <description>jclouds components to access an implementation of Jenkins</description>
@@ -51,19 +51,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
diff --git joyent-cloudapi/pom.xml joyent-cloudapi/pom.xml
index 7890074..5229438 100644
--- joyent-cloudapi/pom.xml
+++ joyent-cloudapi/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.api -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>joyent-cloudapi</artifactId>
   <name>jcloud joyent-cloudapi api</name>
   <description>jclouds components to access an implementation of Joyent SDC</description>
@@ -51,32 +51,32 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-sshj</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>
diff --git joyentcloud/pom.xml joyentcloud/pom.xml
index 749177a..76bcf71 100644
--- joyentcloud/pom.xml
+++ joyentcloud/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>joyentcloud</artifactId>
   <name>jcloud joyentcloud provider</name>
   <description>jclouds components to access the Joyent Cloud</description>
@@ -51,39 +51,39 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds.labs</groupId>
+      <groupId>org.apache.jclouds.labs</groupId>
       <artifactId>joyent-cloudapi</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.labs</groupId>
+      <groupId>org.apache.jclouds.labs</groupId>
       <artifactId>joyent-cloudapi</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-sshj</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>
diff --git nodepool/pom.xml nodepool/pom.xml
index 731a1fe..7fbc492 100644
--- nodepool/pom.xml
+++ nodepool/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.api? -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>nodepool</artifactId>
   <name>jcloud nodepool api</name>
   <packaging>bundle</packaging>
@@ -51,55 +51,55 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-blobstore</artifactId>
       <version>${project.version}</version>
     </dependency>
     <!-- Add all compute so that we can run tests with any provider -->
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-allcompute</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>filesystem</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>byon</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-sshj</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
diff --git opsource-servers/pom.xml opsource-servers/pom.xml
index 8664641..c027d09 100644
--- opsource-servers/pom.xml
+++ opsource-servers/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>opsource-servers</artifactId>
   <name>jcloud opsource-servers provider</name>
   <description>jclouds components to access an implementation of OpSource Cloud Servers</description>
@@ -52,32 +52,32 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-sshj</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-log4j</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
diff --git pom.xml pom.xml
index 249d35b..1fa756f 100644
--- pom.xml
+++ pom.xml
@@ -22,11 +22,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jclouds</groupId>
+        <groupId>org.apache.jclouds</groupId>
         <artifactId>jclouds-project</artifactId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
diff --git savvis-symphonyvpdc/pom.xml savvis-symphonyvpdc/pom.xml
index 03354c1..b425f38 100644
--- savvis-symphonyvpdc/pom.xml
+++ savvis-symphonyvpdc/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>savvis-symphonyvpdc</artifactId>
     <name>jclouds savvis-vpdc vpdc</name>
     <description>jclouds components to access Savvis Symphony VPDC</description>
@@ -54,32 +54,32 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-log4j</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
diff --git smartos-ssh/pom.xml smartos-ssh/pom.xml
index 9100a8c..0ad41f2 100644
--- smartos-ssh/pom.xml
+++ smartos-ssh/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.api -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>smartos-ssh</artifactId>
     <name>smartos ssh api</name>
     <description>jclouds components to access SmartOS over SSH</description>
@@ -49,32 +49,32 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-slf4j</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
diff --git vcloud-director/pom.xml vcloud-director/pom.xml
index a937013..755dd9e 100644
--- vcloud-director/pom.xml
+++ vcloud-director/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.api -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>vcloud-director</artifactId>
   <name>jclouds vcloud-director api</name>
   <description>jclouds components to access an implementation of VMware vCloud Director 1.5+</description>
@@ -71,37 +71,37 @@
       <version>0.4</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.labs</groupId>
+      <groupId>org.apache.jclouds.labs</groupId>
       <artifactId>dmtf</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-sshj</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>
diff --git virtualbox/pom.xml virtualbox/pom.xml
index c933fcd..3dd60dd 100644
--- virtualbox/pom.xml
+++ virtualbox/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.api -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>virtualbox</artifactId>
   <name>jcloud virtualbox api</name>
   <description>jclouds components to access an implementation of virtualbox</description>
@@ -54,7 +54,7 @@
   
   <dependencies>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
@@ -64,7 +64,7 @@
       <version>${virtualbox.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>byon</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
@@ -79,12 +79,12 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-sshj</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
@@ -94,14 +94,14 @@
       <scope>test</scope>
     </dependency>    
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>