diff --git a/apis/pom.xml b/apis/pom.xml
index 494788f003..27a3f017d6 100644
--- a/apis/pom.xml
+++ b/apis/pom.xml
@@ -50,6 +50,7 @@
     <module>rackspace-cloudidentity</module>
     <module>rackspace-cloudloadbalancers</module>
     <module>rackspace-clouddns</module>
+    <module>rackspace-cloudfiles</module>
     <module>sts</module>
     <module>route53</module>
     <module>chef</module>
diff --git a/apis/rackspace-cloudfiles/pom.xml b/apis/rackspace-cloudfiles/pom.xml
index 3a9e3700e8..9afca91c52 100644
--- a/apis/rackspace-cloudfiles/pom.xml
+++ b/apis/rackspace-cloudfiles/pom.xml
@@ -23,11 +23,10 @@
     <groupId>org.apache.jclouds</groupId>
     <artifactId>jclouds-project</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath />
+    <relativePath>../../project/pom.xml</relativePath>
   </parent>
-
-  <!-- TODO: when out of labs, switch to org.jclouds.api -->
-  <groupId>org.apache.jclouds.labs</groupId>
+  
+  <groupId>org.apache.jclouds.api</groupId>
   <artifactId>rackspace-cloudfiles</artifactId>
   <version>2.0.0-SNAPSHOT</version>
   <name>jclouds rackspace-cloudfiles api</name>
@@ -45,19 +44,6 @@
     <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
   </properties>
 
-  <repositories>
-    <repository>
-      <id>apache-snapshots</id>
-      <url>https://repository.apache.org/content/repositories/snapshots</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.jclouds.api</groupId>
diff --git a/providers/pom.xml b/providers/pom.xml
index 9bbc9ba273..b1f5f923aa 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -55,6 +55,8 @@
     <module>hpcloud-objectstorage</module>
     <module>cloudfiles-us</module>
     <module>cloudfiles-uk</module>
+    <module>rackspace-cloudfiles-us</module>
+    <module>rackspace-cloudfiles-uk</module>
     <module>rackspace-clouddns-us</module>
     <module>rackspace-clouddns-uk</module>
     <module>rackspace-clouddatabases-us</module>
diff --git a/providers/rackspace-cloudfiles-uk/pom.xml b/providers/rackspace-cloudfiles-uk/pom.xml
index abcbb848d8..42eea47b52 100644
--- a/providers/rackspace-cloudfiles-uk/pom.xml
+++ b/providers/rackspace-cloudfiles-uk/pom.xml
@@ -23,11 +23,10 @@
     <groupId>org.apache.jclouds</groupId>
     <artifactId>jclouds-project</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath />
+    <relativePath>../../project/pom.xml</relativePath>
   </parent>
 
-  <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-  <groupId>org.apache.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.provider</groupId>
   <artifactId>rackspace-cloudfiles-uk</artifactId>
   <version>2.0.0-SNAPSHOT</version>
   <name>jclouds Rackspace Cloud Files UK provider</name>
@@ -45,19 +44,6 @@
     <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
   </properties>
 
-  <repositories>
-    <repository>
-      <id>apache-snapshots</id>
-      <url>https://repository.apache.org/content/repositories/snapshots</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.jclouds.api</groupId>
diff --git a/providers/rackspace-cloudfiles-us/pom.xml b/providers/rackspace-cloudfiles-us/pom.xml
index e0a150eb91..31e76d7bd5 100644
--- a/providers/rackspace-cloudfiles-us/pom.xml
+++ b/providers/rackspace-cloudfiles-us/pom.xml
@@ -23,11 +23,10 @@
     <groupId>org.apache.jclouds</groupId>
     <artifactId>jclouds-project</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath />
+    <relativePath>../../project/pom.xml</relativePath>
   </parent>
 
-  <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-  <groupId>org.apache.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.provider</groupId>
   <artifactId>rackspace-cloudfiles-us</artifactId>
   <version>2.0.0-SNAPSHOT</version>
   <name>jclouds Rackspace Cloud Files US provider</name>
@@ -45,19 +44,6 @@
     <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
   </properties>
 
-  <repositories>
-    <repository>
-      <id>apache-snapshots</id>
-      <url>https://repository.apache.org/content/repositories/snapshots</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.jclouds.api</groupId>