diff --git a/all/pom.xml b/all/pom.xml
index 986534b15b..6e944b6551 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -60,6 +60,11 @@
             <artifactId>aws-sqs</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jclouds.provider</groupId>
+            <artifactId>aws-sts</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>jclouds-allloadbalancer</artifactId>
diff --git a/apis/pom.xml b/apis/pom.xml
index b4df4e6475..008058e1a7 100644
--- a/apis/pom.xml
+++ b/apis/pom.xml
@@ -56,5 +56,6 @@
        <module>cloudservers</module>
        <module>rackspace-cloudidentity</module>
        <module>rackspace-cloudloadbalancers</module>
+       <module>sts</module>
     </modules>
 </project>
diff --git a/labs/sts/pom.xml b/apis/sts/pom.xml
similarity index 99%
rename from labs/sts/pom.xml
rename to apis/sts/pom.xml
index ea712403c4..1083fffd31 100644
--- a/labs/sts/pom.xml
+++ b/apis/sts/pom.xml
@@ -27,7 +27,7 @@
     <version>1.5.6-SNAPSHOT</version>
     <relativePath>../../project/pom.xml</relativePath>
   </parent>
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.jclouds.api</groupId>
   <artifactId>sts</artifactId>
   <name>jcloud sts api</name>
   <description>jclouds components to access an implementation of Security Token Service (STS)</description>
diff --git a/labs/sts/src/main/java/org/jclouds/sts/STSApi.java b/apis/sts/src/main/java/org/jclouds/sts/STSApi.java
similarity index 100%
rename from labs/sts/src/main/java/org/jclouds/sts/STSApi.java
rename to apis/sts/src/main/java/org/jclouds/sts/STSApi.java
diff --git a/labs/sts/src/main/java/org/jclouds/sts/STSApiMetadata.java b/apis/sts/src/main/java/org/jclouds/sts/STSApiMetadata.java
similarity index 100%
rename from labs/sts/src/main/java/org/jclouds/sts/STSApiMetadata.java
rename to apis/sts/src/main/java/org/jclouds/sts/STSApiMetadata.java
diff --git a/labs/sts/src/main/java/org/jclouds/sts/STSAsyncApi.java b/apis/sts/src/main/java/org/jclouds/sts/STSAsyncApi.java
similarity index 100%
rename from labs/sts/src/main/java/org/jclouds/sts/STSAsyncApi.java
rename to apis/sts/src/main/java/org/jclouds/sts/STSAsyncApi.java
diff --git a/labs/sts/src/main/java/org/jclouds/sts/config/STSRestClientModule.java b/apis/sts/src/main/java/org/jclouds/sts/config/STSRestClientModule.java
similarity index 100%
rename from labs/sts/src/main/java/org/jclouds/sts/config/STSRestClientModule.java
rename to apis/sts/src/main/java/org/jclouds/sts/config/STSRestClientModule.java
diff --git a/labs/sts/src/main/java/org/jclouds/sts/domain/User.java b/apis/sts/src/main/java/org/jclouds/sts/domain/User.java
similarity index 100%
rename from labs/sts/src/main/java/org/jclouds/sts/domain/User.java
rename to apis/sts/src/main/java/org/jclouds/sts/domain/User.java
diff --git a/labs/sts/src/main/java/org/jclouds/sts/domain/UserAndTemporaryCredentials.java b/apis/sts/src/main/java/org/jclouds/sts/domain/UserAndTemporaryCredentials.java
similarity index 100%
rename from labs/sts/src/main/java/org/jclouds/sts/domain/UserAndTemporaryCredentials.java
rename to apis/sts/src/main/java/org/jclouds/sts/domain/UserAndTemporaryCredentials.java
diff --git a/labs/sts/src/main/java/org/jclouds/sts/options/AssumeRoleOptions.java b/apis/sts/src/main/java/org/jclouds/sts/options/AssumeRoleOptions.java
similarity index 100%
rename from labs/sts/src/main/java/org/jclouds/sts/options/AssumeRoleOptions.java
rename to apis/sts/src/main/java/org/jclouds/sts/options/AssumeRoleOptions.java
diff --git a/labs/sts/src/main/java/org/jclouds/sts/options/FederatedUserOptions.java b/apis/sts/src/main/java/org/jclouds/sts/options/FederatedUserOptions.java
similarity index 100%
rename from labs/sts/src/main/java/org/jclouds/sts/options/FederatedUserOptions.java
rename to apis/sts/src/main/java/org/jclouds/sts/options/FederatedUserOptions.java
diff --git a/labs/sts/src/main/java/org/jclouds/sts/options/TemporaryCredentialsOptions.java b/apis/sts/src/main/java/org/jclouds/sts/options/TemporaryCredentialsOptions.java
similarity index 100%
rename from labs/sts/src/main/java/org/jclouds/sts/options/TemporaryCredentialsOptions.java
rename to apis/sts/src/main/java/org/jclouds/sts/options/TemporaryCredentialsOptions.java
diff --git a/labs/sts/src/main/java/org/jclouds/sts/xml/UserAndTemporaryCredentialsHandler.java b/apis/sts/src/main/java/org/jclouds/sts/xml/UserAndTemporaryCredentialsHandler.java
similarity index 100%
rename from labs/sts/src/main/java/org/jclouds/sts/xml/UserAndTemporaryCredentialsHandler.java
rename to apis/sts/src/main/java/org/jclouds/sts/xml/UserAndTemporaryCredentialsHandler.java
diff --git a/labs/sts/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/sts/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
similarity index 100%
rename from labs/sts/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
rename to apis/sts/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
diff --git a/labs/sts/src/test/java/org/jclouds/sts/STSApiExpectTest.java b/apis/sts/src/test/java/org/jclouds/sts/STSApiExpectTest.java
similarity index 100%
rename from labs/sts/src/test/java/org/jclouds/sts/STSApiExpectTest.java
rename to apis/sts/src/test/java/org/jclouds/sts/STSApiExpectTest.java
diff --git a/labs/sts/src/test/java/org/jclouds/sts/STSApiLiveTest.java b/apis/sts/src/test/java/org/jclouds/sts/STSApiLiveTest.java
similarity index 100%
rename from labs/sts/src/test/java/org/jclouds/sts/STSApiLiveTest.java
rename to apis/sts/src/test/java/org/jclouds/sts/STSApiLiveTest.java
diff --git a/labs/sts/src/test/java/org/jclouds/sts/STSApiMetadataTest.java b/apis/sts/src/test/java/org/jclouds/sts/STSApiMetadataTest.java
similarity index 100%
rename from labs/sts/src/test/java/org/jclouds/sts/STSApiMetadataTest.java
rename to apis/sts/src/test/java/org/jclouds/sts/STSApiMetadataTest.java
diff --git a/labs/sts/src/test/java/org/jclouds/sts/internal/BaseSTSApiExpectTest.java b/apis/sts/src/test/java/org/jclouds/sts/internal/BaseSTSApiExpectTest.java
similarity index 100%
rename from labs/sts/src/test/java/org/jclouds/sts/internal/BaseSTSApiExpectTest.java
rename to apis/sts/src/test/java/org/jclouds/sts/internal/BaseSTSApiExpectTest.java
diff --git a/labs/sts/src/test/java/org/jclouds/sts/internal/BaseSTSApiLiveTest.java b/apis/sts/src/test/java/org/jclouds/sts/internal/BaseSTSApiLiveTest.java
similarity index 100%
rename from labs/sts/src/test/java/org/jclouds/sts/internal/BaseSTSApiLiveTest.java
rename to apis/sts/src/test/java/org/jclouds/sts/internal/BaseSTSApiLiveTest.java
diff --git a/labs/sts/src/test/java/org/jclouds/sts/internal/BaseSTSAsyncApiExpectTest.java b/apis/sts/src/test/java/org/jclouds/sts/internal/BaseSTSAsyncApiExpectTest.java
similarity index 100%
rename from labs/sts/src/test/java/org/jclouds/sts/internal/BaseSTSAsyncApiExpectTest.java
rename to apis/sts/src/test/java/org/jclouds/sts/internal/BaseSTSAsyncApiExpectTest.java
diff --git a/labs/sts/src/test/java/org/jclouds/sts/internal/BaseSTSExpectTest.java b/apis/sts/src/test/java/org/jclouds/sts/internal/BaseSTSExpectTest.java
similarity index 100%
rename from labs/sts/src/test/java/org/jclouds/sts/internal/BaseSTSExpectTest.java
rename to apis/sts/src/test/java/org/jclouds/sts/internal/BaseSTSExpectTest.java
diff --git a/labs/sts/src/test/java/org/jclouds/sts/options/AssumeRoleOptionsTest.java b/apis/sts/src/test/java/org/jclouds/sts/options/AssumeRoleOptionsTest.java
similarity index 100%
rename from labs/sts/src/test/java/org/jclouds/sts/options/AssumeRoleOptionsTest.java
rename to apis/sts/src/test/java/org/jclouds/sts/options/AssumeRoleOptionsTest.java
diff --git a/labs/sts/src/test/java/org/jclouds/sts/options/FederatedUserOptionsTest.java b/apis/sts/src/test/java/org/jclouds/sts/options/FederatedUserOptionsTest.java
similarity index 100%
rename from labs/sts/src/test/java/org/jclouds/sts/options/FederatedUserOptionsTest.java
rename to apis/sts/src/test/java/org/jclouds/sts/options/FederatedUserOptionsTest.java
diff --git a/labs/sts/src/test/java/org/jclouds/sts/options/TemporaryCredentialsOptionsTest.java b/apis/sts/src/test/java/org/jclouds/sts/options/TemporaryCredentialsOptionsTest.java
similarity index 100%
rename from labs/sts/src/test/java/org/jclouds/sts/options/TemporaryCredentialsOptionsTest.java
rename to apis/sts/src/test/java/org/jclouds/sts/options/TemporaryCredentialsOptionsTest.java
diff --git a/labs/sts/src/test/java/org/jclouds/sts/parse/AssumeRoleResponseTest.java b/apis/sts/src/test/java/org/jclouds/sts/parse/AssumeRoleResponseTest.java
similarity index 100%
rename from labs/sts/src/test/java/org/jclouds/sts/parse/AssumeRoleResponseTest.java
rename to apis/sts/src/test/java/org/jclouds/sts/parse/AssumeRoleResponseTest.java
diff --git a/labs/sts/src/test/java/org/jclouds/sts/parse/GetFederationTokenResponseTest.java b/apis/sts/src/test/java/org/jclouds/sts/parse/GetFederationTokenResponseTest.java
similarity index 100%
rename from labs/sts/src/test/java/org/jclouds/sts/parse/GetFederationTokenResponseTest.java
rename to apis/sts/src/test/java/org/jclouds/sts/parse/GetFederationTokenResponseTest.java
diff --git a/labs/sts/src/test/java/org/jclouds/sts/parse/GetSessionTokenResponseTest.java b/apis/sts/src/test/java/org/jclouds/sts/parse/GetSessionTokenResponseTest.java
similarity index 100%
rename from labs/sts/src/test/java/org/jclouds/sts/parse/GetSessionTokenResponseTest.java
rename to apis/sts/src/test/java/org/jclouds/sts/parse/GetSessionTokenResponseTest.java
diff --git a/labs/sts/src/test/resources/assume_role.xml b/apis/sts/src/test/resources/assume_role.xml
similarity index 100%
rename from labs/sts/src/test/resources/assume_role.xml
rename to apis/sts/src/test/resources/assume_role.xml
diff --git a/labs/sts/src/test/resources/federation_token.xml b/apis/sts/src/test/resources/federation_token.xml
similarity index 100%
rename from labs/sts/src/test/resources/federation_token.xml
rename to apis/sts/src/test/resources/federation_token.xml
diff --git a/labs/sts/src/test/resources/log4j.xml b/apis/sts/src/test/resources/log4j.xml
similarity index 100%
rename from labs/sts/src/test/resources/log4j.xml
rename to apis/sts/src/test/resources/log4j.xml
diff --git a/labs/sts/src/test/resources/session_token.xml b/apis/sts/src/test/resources/session_token.xml
similarity index 100%
rename from labs/sts/src/test/resources/session_token.xml
rename to apis/sts/src/test/resources/session_token.xml
diff --git a/labs/pom.xml b/labs/pom.xml
index 77fa633cbc..62c26ac79f 100644
--- a/labs/pom.xml
+++ b/labs/pom.xml
@@ -61,7 +61,5 @@
        <module>abiquo</module>
        <module>openstack-quantum</module>
        <module>openstack-glance</module>
-       <module>sts</module>
-       <module>aws-sts</module>
   </modules>
 </project>
diff --git a/labs/aws-sts/pom.xml b/providers/aws-sts/pom.xml
similarity index 97%
rename from labs/aws-sts/pom.xml
rename to providers/aws-sts/pom.xml
index 1f60e90994..d1953312f4 100644
--- a/labs/aws-sts/pom.xml
+++ b/providers/aws-sts/pom.xml
@@ -27,7 +27,7 @@
         <version>1.5.6-SNAPSHOT</version>
         <relativePath>../../project/pom.xml</relativePath>
     </parent>
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.jclouds.provider</groupId>
     <artifactId>aws-sts</artifactId>
     <name>jclouds Amazon Identity and Access Management (STS) provider</name>
     <description>Identity and Access Management (STS) to Amazon Web Services</description>
@@ -46,13 +46,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.jclouds.api</groupId>
             <artifactId>sts</artifactId>
             <version>${project.version}</version>
             <type>jar</type>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.jclouds.api</groupId>
             <artifactId>sts</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
diff --git a/labs/aws-sts/src/main/java/org/jclouds/aws/sts/AWSSTSProviderMetadata.java b/providers/aws-sts/src/main/java/org/jclouds/aws/sts/AWSSTSProviderMetadata.java
similarity index 100%
rename from labs/aws-sts/src/main/java/org/jclouds/aws/sts/AWSSTSProviderMetadata.java
rename to providers/aws-sts/src/main/java/org/jclouds/aws/sts/AWSSTSProviderMetadata.java
diff --git a/labs/aws-sts/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/aws-sts/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
similarity index 100%
rename from labs/aws-sts/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
rename to providers/aws-sts/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
diff --git a/labs/aws-sts/src/test/java/org/jclouds/aws/sts/AWSSTSApiLiveTest.java b/providers/aws-sts/src/test/java/org/jclouds/aws/sts/AWSSTSApiLiveTest.java
similarity index 100%
rename from labs/aws-sts/src/test/java/org/jclouds/aws/sts/AWSSTSApiLiveTest.java
rename to providers/aws-sts/src/test/java/org/jclouds/aws/sts/AWSSTSApiLiveTest.java
diff --git a/labs/aws-sts/src/test/java/org/jclouds/aws/sts/AWSSTSProviderTest.java b/providers/aws-sts/src/test/java/org/jclouds/aws/sts/AWSSTSProviderTest.java
similarity index 100%
rename from labs/aws-sts/src/test/java/org/jclouds/aws/sts/AWSSTSProviderTest.java
rename to providers/aws-sts/src/test/java/org/jclouds/aws/sts/AWSSTSProviderTest.java
diff --git a/providers/pom.xml b/providers/pom.xml
index d0d3bbf881..10b7196ca8 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -77,5 +77,6 @@
         <module>rackspace-cloudblockstorage-us</module>
         <module>rackspace-cloudblockstorage-uk</module>
         <module>glesys</module>
+        <module>aws-sts</module>
     </modules>
 </project>