diff --git a/all/pom.xml b/all/pom.xml
index 3722ad0936..3cbd12c020 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -49,5 +49,10 @@
aws-elb
${project.version}
+
+ org.jclouds.api
+ sqs
+ ${project.version}
+
diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/SQSAsyncClient.java b/apis/sqs/src/main/java/org/jclouds/sqs/SQSAsyncClient.java
similarity index 85%
rename from aws/core/src/main/java/org/jclouds/aws/sqs/SQSAsyncClient.java
rename to apis/sqs/src/main/java/org/jclouds/sqs/SQSAsyncClient.java
index f80b338f90..9595946fca 100644
--- a/aws/core/src/main/java/org/jclouds/aws/sqs/SQSAsyncClient.java
+++ b/apis/sqs/src/main/java/org/jclouds/sqs/SQSAsyncClient.java
@@ -17,10 +17,10 @@
* ====================================================================
*/
-package org.jclouds.aws.sqs;
+package org.jclouds.sqs;
-import static org.jclouds.aws.sqs.reference.SQSParameters.ACTION;
-import static org.jclouds.aws.sqs.reference.SQSParameters.VERSION;
+import static org.jclouds.sqs.reference.SQSParameters.ACTION;
+import static org.jclouds.sqs.reference.SQSParameters.VERSION;
import java.util.Set;
@@ -30,19 +30,19 @@ import javax.ws.rs.POST;
import javax.ws.rs.Path;
import org.jclouds.aws.filters.FormSigner;
-import org.jclouds.aws.sqs.domain.Queue;
-import org.jclouds.aws.sqs.functions.QueueLocation;
-import org.jclouds.aws.sqs.options.CreateQueueOptions;
-import org.jclouds.aws.sqs.options.ListQueuesOptions;
-import org.jclouds.aws.sqs.xml.RegexListQueuesResponseHandler;
-import org.jclouds.aws.sqs.xml.RegexMD5Handler;
-import org.jclouds.aws.sqs.xml.RegexQueueHandler;
import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull;
import org.jclouds.rest.annotations.EndpointParam;
import org.jclouds.rest.annotations.FormParams;
import org.jclouds.rest.annotations.RequestFilters;
import org.jclouds.rest.annotations.ResponseParser;
import org.jclouds.rest.annotations.VirtualHost;
+import org.jclouds.sqs.domain.Queue;
+import org.jclouds.sqs.functions.QueueLocation;
+import org.jclouds.sqs.options.CreateQueueOptions;
+import org.jclouds.sqs.options.ListQueuesOptions;
+import org.jclouds.sqs.xml.RegexListQueuesResponseHandler;
+import org.jclouds.sqs.xml.RegexMD5Handler;
+import org.jclouds.sqs.xml.RegexQueueHandler;
import com.google.common.util.concurrent.ListenableFuture;
diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/SQSClient.java b/apis/sqs/src/main/java/org/jclouds/sqs/SQSClient.java
similarity index 96%
rename from aws/core/src/main/java/org/jclouds/aws/sqs/SQSClient.java
rename to apis/sqs/src/main/java/org/jclouds/sqs/SQSClient.java
index cd382408fa..70f7f5b8f9 100644
--- a/aws/core/src/main/java/org/jclouds/aws/sqs/SQSClient.java
+++ b/apis/sqs/src/main/java/org/jclouds/sqs/SQSClient.java
@@ -17,16 +17,16 @@
* ====================================================================
*/
-package org.jclouds.aws.sqs;
+package org.jclouds.sqs;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import javax.annotation.Nullable;
-import org.jclouds.aws.sqs.domain.Queue;
-import org.jclouds.aws.sqs.options.CreateQueueOptions;
-import org.jclouds.aws.sqs.options.ListQueuesOptions;
+import org.jclouds.sqs.domain.Queue;
+import org.jclouds.sqs.options.CreateQueueOptions;
+import org.jclouds.sqs.options.ListQueuesOptions;
import org.jclouds.concurrent.Timeout;
/**
diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/SQSContextBuilder.java b/apis/sqs/src/main/java/org/jclouds/sqs/SQSContextBuilder.java
old mode 100755
new mode 100644
similarity index 95%
rename from aws/core/src/main/java/org/jclouds/aws/sqs/SQSContextBuilder.java
rename to apis/sqs/src/main/java/org/jclouds/sqs/SQSContextBuilder.java
index 376aed7f35..a6895c9748
--- a/aws/core/src/main/java/org/jclouds/aws/sqs/SQSContextBuilder.java
+++ b/apis/sqs/src/main/java/org/jclouds/sqs/SQSContextBuilder.java
@@ -17,12 +17,12 @@
* ====================================================================
*/
-package org.jclouds.aws.sqs;
+package org.jclouds.sqs;
import java.util.List;
import java.util.Properties;
-import org.jclouds.aws.sqs.config.SQSRestClientModule;
+import org.jclouds.sqs.config.SQSRestClientModule;
import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule;
import org.jclouds.logging.jdk.config.JDKLoggingModule;
import org.jclouds.rest.RestContextBuilder;
diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/SQSPropertiesBuilder.java b/apis/sqs/src/main/java/org/jclouds/sqs/SQSPropertiesBuilder.java
similarity index 98%
rename from aws/core/src/main/java/org/jclouds/aws/sqs/SQSPropertiesBuilder.java
rename to apis/sqs/src/main/java/org/jclouds/sqs/SQSPropertiesBuilder.java
index 65a0d93a84..dba702da45 100644
--- a/aws/core/src/main/java/org/jclouds/aws/sqs/SQSPropertiesBuilder.java
+++ b/apis/sqs/src/main/java/org/jclouds/sqs/SQSPropertiesBuilder.java
@@ -17,7 +17,7 @@
* ====================================================================
*/
-package org.jclouds.aws.sqs;
+package org.jclouds.sqs;
import static org.jclouds.Constants.PROPERTY_API_VERSION;
import static org.jclouds.Constants.PROPERTY_ENDPOINT;
diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/config/SQSRestClientModule.java b/apis/sqs/src/main/java/org/jclouds/sqs/config/SQSRestClientModule.java
old mode 100755
new mode 100644
similarity index 91%
rename from aws/core/src/main/java/org/jclouds/aws/sqs/config/SQSRestClientModule.java
rename to apis/sqs/src/main/java/org/jclouds/sqs/config/SQSRestClientModule.java
index 4ba6d7caa0..592b8dee5c
--- a/aws/core/src/main/java/org/jclouds/aws/sqs/config/SQSRestClientModule.java
+++ b/apis/sqs/src/main/java/org/jclouds/sqs/config/SQSRestClientModule.java
@@ -17,13 +17,13 @@
* ====================================================================
*/
-package org.jclouds.aws.sqs.config;
+package org.jclouds.sqs.config;
import org.jclouds.aws.config.FormSigningRestClientModule;
-import org.jclouds.aws.sqs.SQSAsyncClient;
-import org.jclouds.aws.sqs.SQSClient;
import org.jclouds.http.RequiresHttp;
import org.jclouds.rest.ConfiguresRestClient;
+import org.jclouds.sqs.SQSAsyncClient;
+import org.jclouds.sqs.SQSClient;
/**
* Configures the SQS connection.
@@ -38,4 +38,4 @@ public class SQSRestClientModule extends FormSigningRestClientModule {
}
-}
\ No newline at end of file
+}
diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/functions/QueueLocation.java b/apis/sqs/src/main/java/org/jclouds/sqs/functions/QueueLocation.java
similarity index 92%
rename from aws/core/src/main/java/org/jclouds/aws/sqs/functions/QueueLocation.java
rename to apis/sqs/src/main/java/org/jclouds/sqs/functions/QueueLocation.java
index 460d301127..82c70bdf5e 100644
--- a/aws/core/src/main/java/org/jclouds/aws/sqs/functions/QueueLocation.java
+++ b/apis/sqs/src/main/java/org/jclouds/sqs/functions/QueueLocation.java
@@ -17,13 +17,13 @@
* ====================================================================
*/
-package org.jclouds.aws.sqs.functions;
+package org.jclouds.sqs.functions;
import java.net.URI;
import javax.inject.Singleton;
-import org.jclouds.aws.sqs.domain.Queue;
+import org.jclouds.sqs.domain.Queue;
import com.google.common.base.Function;
@@ -38,4 +38,4 @@ public class QueueLocation implements Function