diff --git a/apis/cloudwatch/pom.xml b/apis/cloudwatch/pom.xml
index 2f200ecf50..c03f04a8e0 100644
--- a/apis/cloudwatch/pom.xml
+++ b/apis/cloudwatch/pom.xml
@@ -46,8 +46,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds.common</groupId>
-      <artifactId>aws-common</artifactId>
+      <groupId>org.jclouds.api</groupId>
+      <artifactId>sts</artifactId>
       <version>${project.version}</version>
       <type>jar</type>
     </dependency>
diff --git a/apis/ec2/pom.xml b/apis/ec2/pom.xml
index 2874e06d33..16bf07471e 100644
--- a/apis/ec2/pom.xml
+++ b/apis/ec2/pom.xml
@@ -54,8 +54,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds.common</groupId>
-      <artifactId>aws-common</artifactId>
+      <groupId>org.jclouds.api</groupId>
+      <artifactId>sts</artifactId>
       <version>${project.version}</version>
       <type>jar</type>
     </dependency>
diff --git a/apis/s3/pom.xml b/apis/s3/pom.xml
index 910ba41fb9..6f9b1dbc9c 100644
--- a/apis/s3/pom.xml
+++ b/apis/s3/pom.xml
@@ -51,8 +51,8 @@
       <version>0.4</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.common</groupId>
-      <artifactId>aws-common</artifactId>
+      <groupId>org.jclouds.api</groupId>
+      <artifactId>sts</artifactId>
       <version>${project.version}</version>
       <type>jar</type>
     </dependency>
diff --git a/apis/sqs/pom.xml b/apis/sqs/pom.xml
index f15522c46e..c377f70cfd 100644
--- a/apis/sqs/pom.xml
+++ b/apis/sqs/pom.xml
@@ -46,8 +46,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.common</groupId>
-            <artifactId>aws-common</artifactId>
+            <groupId>org.jclouds.api</groupId>
+            <artifactId>sts</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/apis/sts/pom.xml b/apis/sts/pom.xml
index 47e20e3e11..b8f63999eb 100644
--- a/apis/sts/pom.xml
+++ b/apis/sts/pom.xml
@@ -40,14 +40,14 @@
     <test.sts.identity>${test.aws.identity}</test.sts.identity>
     <test.sts.credential>${test.aws.credential}</test.sts.credential>
 
-    <jclouds.osgi.export>org.jclouds.sts*;version="${project.version}"</jclouds.osgi.export>
+    <jclouds.osgi.export>org.jclouds.aws*;version="${project.version},org.jclouds.sts*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
   </properties>
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds.common</groupId>
-      <artifactId>aws-common</artifactId>
+      <groupId>org.jclouds</groupId>
+      <artifactId>jclouds-core</artifactId>
       <version>${project.version}</version>
       <type>jar</type>
     </dependency>
diff --git a/common/aws/src/main/java/org/jclouds/aws/AWSResponseException.java b/apis/sts/src/main/java/org/jclouds/aws/AWSResponseException.java
similarity index 100%
rename from common/aws/src/main/java/org/jclouds/aws/AWSResponseException.java
rename to apis/sts/src/main/java/org/jclouds/aws/AWSResponseException.java
diff --git a/common/aws/src/main/java/org/jclouds/aws/binders/BindMapToIndexedFormParams.java b/apis/sts/src/main/java/org/jclouds/aws/binders/BindMapToIndexedFormParams.java
similarity index 100%
rename from common/aws/src/main/java/org/jclouds/aws/binders/BindMapToIndexedFormParams.java
rename to apis/sts/src/main/java/org/jclouds/aws/binders/BindMapToIndexedFormParams.java
diff --git a/common/aws/src/main/java/org/jclouds/aws/binders/BindTableToIndexedFormParams.java b/apis/sts/src/main/java/org/jclouds/aws/binders/BindTableToIndexedFormParams.java
similarity index 100%
rename from common/aws/src/main/java/org/jclouds/aws/binders/BindTableToIndexedFormParams.java
rename to apis/sts/src/main/java/org/jclouds/aws/binders/BindTableToIndexedFormParams.java
diff --git a/common/aws/src/main/java/org/jclouds/aws/config/AWSRestClientModule.java b/apis/sts/src/main/java/org/jclouds/aws/config/AWSRestClientModule.java
similarity index 100%
rename from common/aws/src/main/java/org/jclouds/aws/config/AWSRestClientModule.java
rename to apis/sts/src/main/java/org/jclouds/aws/config/AWSRestClientModule.java
diff --git a/common/aws/src/main/java/org/jclouds/aws/config/FormSigningRestClientModule.java b/apis/sts/src/main/java/org/jclouds/aws/config/FormSigningRestClientModule.java
similarity index 100%
rename from common/aws/src/main/java/org/jclouds/aws/config/FormSigningRestClientModule.java
rename to apis/sts/src/main/java/org/jclouds/aws/config/FormSigningRestClientModule.java
diff --git a/common/aws/src/main/java/org/jclouds/aws/config/WithZonesFormSigningRestClientModule.java b/apis/sts/src/main/java/org/jclouds/aws/config/WithZonesFormSigningRestClientModule.java
similarity index 100%
rename from common/aws/src/main/java/org/jclouds/aws/config/WithZonesFormSigningRestClientModule.java
rename to apis/sts/src/main/java/org/jclouds/aws/config/WithZonesFormSigningRestClientModule.java
diff --git a/common/aws/src/main/java/org/jclouds/aws/domain/AWSError.java b/apis/sts/src/main/java/org/jclouds/aws/domain/AWSError.java
similarity index 100%
rename from common/aws/src/main/java/org/jclouds/aws/domain/AWSError.java
rename to apis/sts/src/main/java/org/jclouds/aws/domain/AWSError.java
diff --git a/common/aws/src/main/java/org/jclouds/aws/domain/Region.java b/apis/sts/src/main/java/org/jclouds/aws/domain/Region.java
similarity index 100%
rename from common/aws/src/main/java/org/jclouds/aws/domain/Region.java
rename to apis/sts/src/main/java/org/jclouds/aws/domain/Region.java
diff --git a/common/aws/src/main/java/org/jclouds/aws/domain/TemporaryCredentials.java b/apis/sts/src/main/java/org/jclouds/aws/domain/TemporaryCredentials.java
similarity index 100%
rename from common/aws/src/main/java/org/jclouds/aws/domain/TemporaryCredentials.java
rename to apis/sts/src/main/java/org/jclouds/aws/domain/TemporaryCredentials.java
diff --git a/common/aws/src/main/java/org/jclouds/aws/filters/FormSigner.java b/apis/sts/src/main/java/org/jclouds/aws/filters/FormSigner.java
similarity index 100%
rename from common/aws/src/main/java/org/jclouds/aws/filters/FormSigner.java
rename to apis/sts/src/main/java/org/jclouds/aws/filters/FormSigner.java
diff --git a/common/aws/src/main/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandler.java b/apis/sts/src/main/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandler.java
similarity index 100%
rename from common/aws/src/main/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandler.java
rename to apis/sts/src/main/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandler.java
diff --git a/common/aws/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java b/apis/sts/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java
similarity index 100%
rename from common/aws/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java
rename to apis/sts/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java
diff --git a/common/aws/src/main/java/org/jclouds/aws/handlers/package-info.java b/apis/sts/src/main/java/org/jclouds/aws/handlers/package-info.java
similarity index 100%
rename from common/aws/src/main/java/org/jclouds/aws/handlers/package-info.java
rename to apis/sts/src/main/java/org/jclouds/aws/handlers/package-info.java
diff --git a/common/aws/src/main/java/org/jclouds/aws/reference/AWSConstants.java b/apis/sts/src/main/java/org/jclouds/aws/reference/AWSConstants.java
similarity index 100%
rename from common/aws/src/main/java/org/jclouds/aws/reference/AWSConstants.java
rename to apis/sts/src/main/java/org/jclouds/aws/reference/AWSConstants.java
diff --git a/common/aws/src/main/java/org/jclouds/aws/reference/FormParameters.java b/apis/sts/src/main/java/org/jclouds/aws/reference/FormParameters.java
similarity index 100%
rename from common/aws/src/main/java/org/jclouds/aws/reference/FormParameters.java
rename to apis/sts/src/main/java/org/jclouds/aws/reference/FormParameters.java
diff --git a/common/aws/src/main/java/org/jclouds/aws/util/AWSUtils.java b/apis/sts/src/main/java/org/jclouds/aws/util/AWSUtils.java
similarity index 100%
rename from common/aws/src/main/java/org/jclouds/aws/util/AWSUtils.java
rename to apis/sts/src/main/java/org/jclouds/aws/util/AWSUtils.java
diff --git a/common/aws/src/main/java/org/jclouds/aws/xml/ErrorHandler.java b/apis/sts/src/main/java/org/jclouds/aws/xml/ErrorHandler.java
similarity index 100%
rename from common/aws/src/main/java/org/jclouds/aws/xml/ErrorHandler.java
rename to apis/sts/src/main/java/org/jclouds/aws/xml/ErrorHandler.java
diff --git a/common/aws/src/main/java/org/jclouds/aws/xml/TemporaryCredentialsHandler.java b/apis/sts/src/main/java/org/jclouds/aws/xml/TemporaryCredentialsHandler.java
similarity index 100%
rename from common/aws/src/main/java/org/jclouds/aws/xml/TemporaryCredentialsHandler.java
rename to apis/sts/src/main/java/org/jclouds/aws/xml/TemporaryCredentialsHandler.java
diff --git a/common/aws/src/test/java/org/jclouds/aws/filters/FormSignerTest.java b/apis/sts/src/test/java/org/jclouds/aws/filters/FormSignerTest.java
similarity index 100%
rename from common/aws/src/test/java/org/jclouds/aws/filters/FormSignerTest.java
rename to apis/sts/src/test/java/org/jclouds/aws/filters/FormSignerTest.java
diff --git a/common/aws/src/test/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandlerTest.java b/apis/sts/src/test/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandlerTest.java
similarity index 100%
rename from common/aws/src/test/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandlerTest.java
rename to apis/sts/src/test/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandlerTest.java
diff --git a/common/aws/src/test/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContentTest.java b/apis/sts/src/test/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContentTest.java
similarity index 100%
rename from common/aws/src/test/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContentTest.java
rename to apis/sts/src/test/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContentTest.java
diff --git a/common/aws/src/test/java/org/jclouds/aws/util/AWSUtilsTest.java b/apis/sts/src/test/java/org/jclouds/aws/util/AWSUtilsTest.java
similarity index 100%
rename from common/aws/src/test/java/org/jclouds/aws/util/AWSUtilsTest.java
rename to apis/sts/src/test/java/org/jclouds/aws/util/AWSUtilsTest.java
diff --git a/common/aws/src/test/java/org/jclouds/aws/xml/ErrorHandlerTest.java b/apis/sts/src/test/java/org/jclouds/aws/xml/ErrorHandlerTest.java
similarity index 100%
rename from common/aws/src/test/java/org/jclouds/aws/xml/ErrorHandlerTest.java
rename to apis/sts/src/test/java/org/jclouds/aws/xml/ErrorHandlerTest.java
diff --git a/common/aws/src/test/java/org/jclouds/aws/xml/TemporaryCredentialsHandlerTest.java b/apis/sts/src/test/java/org/jclouds/aws/xml/TemporaryCredentialsHandlerTest.java
similarity index 100%
rename from common/aws/src/test/java/org/jclouds/aws/xml/TemporaryCredentialsHandlerTest.java
rename to apis/sts/src/test/java/org/jclouds/aws/xml/TemporaryCredentialsHandlerTest.java
diff --git a/common/aws/src/test/resources/credentials.xml b/apis/sts/src/test/resources/credentials.xml
similarity index 100%
rename from common/aws/src/test/resources/credentials.xml
rename to apis/sts/src/test/resources/credentials.xml
diff --git a/common/aws/src/test/resources/error.xml b/apis/sts/src/test/resources/error.xml
similarity index 100%
rename from common/aws/src/test/resources/error.xml
rename to apis/sts/src/test/resources/error.xml
diff --git a/common/aws/README.txt b/common/aws/README.txt
deleted file mode 100644
index d3d576764f..0000000000
--- a/common/aws/README.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-====
-    Licensed to jclouds, Inc. (jclouds) under one or more
-    contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  jclouds licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-====
-
-#
-# The jclouds provider for Amazon Web Services (http://aws.amazon.com/).
-#
-# TODO: Implementation status.
-# TODO: Supported features.
-# TODO: Usage example.
\ No newline at end of file
diff --git a/common/aws/pom.xml b/common/aws/pom.xml
deleted file mode 100644
index 7c3dbea7fd..0000000000
--- a/common/aws/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to jclouds, Inc. (jclouds) under one or more
-    contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  jclouds licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-<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>
-        <artifactId>jclouds-project</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
-        <relativePath>../../project/pom.xml</relativePath>
-    </parent>
-    <groupId>org.jclouds.common</groupId>
-    <artifactId>aws-common</artifactId>
-    <name>jclouds Amazon AWS Components Core</name>
-    <description>jclouds Core components to access Amazon AWS</description>
-    <packaging>bundle</packaging>
-
-    <properties>
-        <jclouds.osgi.export>org.jclouds.aws*;version="${project.version}"</jclouds.osgi.export>
-        <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/common/aws/src/test/resources/log4j.xml b/common/aws/src/test/resources/log4j.xml
deleted file mode 100644
index 7527432931..0000000000
--- a/common/aws/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-    <!--
-        For more configuration infromation and examples see the Apache
-        Log4j website: http://logging.apache.org/log4j/
-    -->
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
-    debug="false">
-
-    <!-- A time/date based rolling appender -->
-    <appender name="WIREFILE" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="target/test-data/jclouds-wire.log" />
-        <param name="Append" value="true" />
-
-        <!-- Rollover at midnight each day -->
-        <param name="DatePattern" value="'.'yyyy-MM-dd" />
-
-        <param name="Threshold" value="TRACE" />
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <!-- The default pattern: Date Priority [Category] Message\n -->
-            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-
-            <!--
-                The full pattern: Date MS Priority [Category]
-                (Thread:NDC) Message\n <param name="ConversionPattern"
-                value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
-            -->
-        </layout>
-    </appender>
-
-    <!-- A time/date based rolling appender -->
-    <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="target/test-data/jclouds.log" />
-        <param name="Append" value="true" />
-
-        <!-- Rollover at midnight each day -->
-        <param name="DatePattern" value="'.'yyyy-MM-dd" />
-
-        <param name="Threshold" value="TRACE" />
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <!-- The default pattern: Date Priority [Category] Message\n -->
-            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-
-            <!--
-                The full pattern: Date MS Priority [Category]
-                (Thread:NDC) Message\n <param name="ConversionPattern"
-                value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
-            -->
-        </layout>
-    </appender>
-    <!-- A time/date based rolling appender -->
-    <appender name="BLOBSTOREFILE" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="target/test-data/jclouds-blobstore.log" />
-        <param name="Append" value="true" />
-        <param name="DatePattern" value="'.'yyyy-MM-dd" />
-        <param name="Threshold" value="TRACE" />
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-        </layout>
-    </appender>
-
-    <!-- A time/date based rolling appender -->
-    <appender name="COMPUTEFILE" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="target/test-data/jclouds-compute.log" />
-        <param name="Append" value="true" />
-
-        <!-- Rollover at midnight each day -->
-        <param name="DatePattern" value="'.'yyyy-MM-dd" />
-
-        <param name="Threshold" value="TRACE" />
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <!-- The default pattern: Date Priority [Category] Message\n -->
-            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-
-            <!--
-                The full pattern: Date MS Priority [Category]
-                (Thread:NDC) Message\n <param name="ConversionPattern"
-                value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
-            -->
-        </layout>
-    </appender>
-
-    <!-- A time/date based rolling appender -->
-    <appender name="SSHFILE" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="target/test-data/jclouds-ssh.log" />
-        <param name="Append" value="true" />
-
-        <!-- Rollover at midnight each day -->
-        <param name="DatePattern" value="'.'yyyy-MM-dd" />
-
-        <param name="Threshold" value="TRACE" />
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <!-- The default pattern: Date Priority [Category] Message\n -->
-            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
-
-            <!--
-                The full pattern: Date MS Priority [Category]
-                (Thread:NDC) Message\n <param name="ConversionPattern"
-                value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
-            -->
-        </layout>
-    </appender>
-
-    <appender name="ASYNCCOMPUTE" class="org.apache.log4j.AsyncAppender">
-        <appender-ref ref="COMPUTEFILE" />
-    </appender>
-
-    <appender name="ASYNCSSH" class="org.apache.log4j.AsyncAppender">
-        <appender-ref ref="SSHFILE" />
-    </appender>
-
-    <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
-        <appender-ref ref="FILE" />
-    </appender>
-
-    <appender name="ASYNCWIRE" class="org.apache.log4j.AsyncAppender">
-        <appender-ref ref="WIREFILE" />
-    </appender>
-
-    <appender name="ASYNCBLOBSTORE" class="org.apache.log4j.AsyncAppender">
-        <appender-ref ref="BLOBSTOREFILE" />
-    </appender>
-    <!-- ================ -->
-    <!-- Limit categories -->
-    <!-- ================ -->
-
-    <category name="org.jclouds">
-        <priority value="DEBUG" />
-        <appender-ref ref="ASYNC" />
-    </category>
-
-    <category name="jclouds.headers">
-        <priority value="DEBUG" />
-        <appender-ref ref="ASYNCWIRE" />
-    </category>
-
-    <category name="jclouds.ssh">
-        <priority value="DEBUG" />
-        <appender-ref ref="ASYNCSSH" />
-    </category>
-    <category name="jclouds.wire">
-        <priority value="DEBUG" />
-        <appender-ref ref="ASYNCWIRE" />
-    </category>
-    <category name="jclouds.blobstore">
-        <priority value="DEBUG" />
-        <appender-ref ref="ASYNCBLOBSTORE" />
-    </category>
-    <category name="jclouds.compute">
-        <priority value="TRACE" />
-        <appender-ref ref="ASYNCCOMPUTE" />
-    </category>
-    <!-- ======================= -->
-    <!-- Setup the Root category -->
-    <!-- ======================= -->
-
-    <root>
-        <priority value="WARN" />
-    </root>
-
-</log4j:configuration>
diff --git a/common/pom.xml b/common/pom.xml
index 1772dba2ea..d59b98e8e1 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -33,7 +33,6 @@
     <name>jclouds commons project</name>
     <modules>
        <module>azure</module>
-       <module>aws</module>
        <module>openstack</module>
        <module>trmk</module>
     </modules>
diff --git a/labs/elb/pom.xml b/labs/elb/pom.xml
index 476b8b0b9f..11c5b3436e 100644
--- a/labs/elb/pom.xml
+++ b/labs/elb/pom.xml
@@ -53,8 +53,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.common</groupId>
-            <artifactId>aws-common</artifactId>
+            <groupId>org.jclouds.api</groupId>
+            <artifactId>sts</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/labs/iam/pom.xml b/labs/iam/pom.xml
index d32fbb61d7..90430336cf 100644
--- a/labs/iam/pom.xml
+++ b/labs/iam/pom.xml
@@ -46,8 +46,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds.common</groupId>
-      <artifactId>aws-common</artifactId>
+      <groupId>org.jclouds.api</groupId>
+      <artifactId>sts</artifactId>
       <version>${project.version}</version>
       <type>jar</type>
     </dependency>
diff --git a/labs/rds/pom.xml b/labs/rds/pom.xml
index e3ccd77556..f449bfe11d 100644
--- a/labs/rds/pom.xml
+++ b/labs/rds/pom.xml
@@ -46,8 +46,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.common</groupId>
-            <artifactId>aws-common</artifactId>
+            <groupId>org.jclouds.api</groupId>
+            <artifactId>sts</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/labs/route53/pom.xml b/labs/route53/pom.xml
index f619389472..b2a00aa3cc 100644
--- a/labs/route53/pom.xml
+++ b/labs/route53/pom.xml
@@ -46,8 +46,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds.common</groupId>
-      <artifactId>aws-common</artifactId>
+      <groupId>org.jclouds.api</groupId>
+      <artifactId>sts</artifactId>
       <version>${project.version}</version>
       <type>jar</type>
     </dependency>
diff --git a/providers/aws-ec2/pom.xml b/providers/aws-ec2/pom.xml
index d55cd4a719..0091f14e08 100644
--- a/providers/aws-ec2/pom.xml
+++ b/providers/aws-ec2/pom.xml
@@ -56,11 +56,6 @@
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>org.jclouds.common</groupId>
-      <artifactId>aws-common</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.jclouds.api</groupId>
       <artifactId>ec2</artifactId>