diff --git a/atmosonline/saas/pom.xml b/atmosonline/saas/pom.xml
index 27e86cee56..ee6c92e44d 100644
--- a/atmosonline/saas/pom.xml
+++ b/atmosonline/saas/pom.xml
@@ -46,12 +46,12 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-blobstore</artifactId>
+            <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-blobstore</artifactId>
+            <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
diff --git a/aws/pom.xml b/aws/pom.xml
index 96f4c10d79..63c27ed38b 100644
--- a/aws/pom.xml
+++ b/aws/pom.xml
@@ -56,12 +56,12 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-blobstore</artifactId>
+            <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-blobstore</artifactId>
+            <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
@@ -71,18 +71,6 @@
             <artifactId>java-xmlbuilder</artifactId>
             <version>0.3</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
         <dependency>
            <groupId>log4j</groupId>
            <artifactId>log4j</artifactId>
diff --git a/azure/storage/blob/pom.xml b/azure/storage/blob/pom.xml
index b2a6a60d68..f538b5e0d6 100644
--- a/azure/storage/blob/pom.xml
+++ b/azure/storage/blob/pom.xml
@@ -45,12 +45,12 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-blobstore</artifactId>
+            <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-blobstore</artifactId>
+            <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
diff --git a/blobstore/core/pom.xml b/blobstore/core/pom.xml
deleted file mode 100755
index 11e6df00d3..0000000000
--- a/blobstore/core/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   $HeadURL$
-   $Revision$
-   $Date$
-
-   Copyright (C) 2009 Adrian Cole <adrian@jclouds.org>
-
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF 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.html 
-
-   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">
-    <parent>
-        <groupId>org.jclouds</groupId>
-        <artifactId>jclouds-blobstore-project</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.jclouds</groupId>
-    <artifactId>jclouds-blobstore</artifactId>
-    <name>jclouds blobstore Components Core</name>
-    <packaging>jar</packaging>
-    <description>jclouds Core components to access blobstores</description>
-
-    <scm>
-        <connection>scm:svn:http://jclouds.googlecode.com/svn/trunk/blobstore/core</connection>
-        <developerConnection>scm:svn:https://jclouds.googlecode.com/svn/trunk/blobstore/core</developerConnection>
-        <url>http://jclouds.googlecode.com/svn/trunk/blobstore/core</url>
-    </scm>
-        <properties>
-                <jclouds.blobstore.httpstream.url>http://apache.multihomed.net/maven/binaries/apache-maven-2.2.0-bin.zip</jclouds.blobstore.httpstream.url>
-                <jclouds.blobstore.httpstream.md5>132bcde2aeca20acb0b16c1c66b74984</jclouds.blobstore.httpstream.md5>
-        </properties>
-<dependencies>
-                <dependency>
-                        <groupId>${project.groupId}</groupId>
-                        <artifactId>jclouds-httpnio</artifactId>
-                        <version>${project.version}</version>
-                        <scope>test</scope>
-                </dependency>
-</dependencies>
-
-
-
-</project>
diff --git a/blobstore/pom.xml b/blobstore/pom.xml
deleted file mode 100755
index 04931bedce..0000000000
--- a/blobstore/pom.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   $HeadURL$
-   $Revision$
-   $Date$
-
-   Copyright (C) 2009 Adrian Cole <adrian@jclouds.org>
-
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF 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.html 
-
-   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">
-    <parent>
-        <artifactId>jclouds-project</artifactId>
-        <groupId>org.jclouds</groupId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../project/pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>jclouds-blobstore-project</artifactId>
-    <packaging>pom</packaging>
-    <name>jclouds blobstore project</name>
-    <modules>
-        <module>core</module>
-    </modules>
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-           <groupId>log4j</groupId>
-           <artifactId>log4j</artifactId>
-           <version>1.2.14</version>
-           <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-log4j</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.4.3</version>
-                <executions>
-                    <execution>
-                        <id>integration</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <!-- note that the groups/excluded groups don't work due to some problem
-                        in surefire or testng. instead, we have to exclude via file path
-                           <groups>integration</groups>
-                           <excludedGroups>unit,performance,live</excludedGroups> -->
-                            <excludes>
-                                <exclude>**/*LiveTest.java</exclude>
-                                <exclude>**/Base*Test.java</exclude>
-                            </excludes>
-                            <includes>
-                                <include>**/*IntegrationTest.java</include>
-                            </includes>
-                            <systemProperties>
-                                <property>
-                                   <name>jclouds.test.initializer</name>
-                                   <value>org.jclouds.blobstore.integration.StubTestInitializer</value>
-                                </property>
-                                <property>
-                                    <name>jclouds.blobstore.httpstream.url</name>
-                                    <value>${jclouds.blobstore.httpstream.url}</value>
-                                </property>
-                                <property>
-                                    <name>jclouds.blobstore.httpstream.md5</name>
-                                    <value>${jclouds.blobstore.httpstream.md5}</value>
-                                </property>
-                            </systemProperties>
-                        </configuration>
-                    </execution>
-                </executions>
-                <configuration>
-                    <!-- note that the groups/excluded groups don't work due to some problem
-                         in surefire or testng. instead, we have to exclude via file path
-                    <groups>unit,performance</groups>
-                    <excludedGroups>integration,live</excludedGroups> -->
-                    <excludes>
-                        <exclude>**/*IntegrationTest.java</exclude>
-                        <exclude>**/*LiveTest.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/core/pom.xml b/core/pom.xml
index 5721c3f2f9..680534c0b7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -40,6 +40,11 @@
         <url>http://jclouds.googlecode.com/svn/trunk</url>
     </scm>
 
+    <properties>
+        <jclouds.blobstore.httpstream.url>http://apache.multihomed.net/maven/binaries/apache-maven-2.2.0-bin.zip</jclouds.blobstore.httpstream.url>
+        <jclouds.blobstore.httpstream.md5>132bcde2aeca20acb0b16c1c66b74984</jclouds.blobstore.httpstream.md5>
+    </properties>
+
     <repositories>
         <repository>
             <id>gson</id>
@@ -89,7 +94,7 @@
             <version>1.0</version>
         </dependency>
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
             <version>7.0.0pre3</version>
             <scope>test</scope>
@@ -110,5 +115,67 @@
             <version>1.4</version>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.4.3</version>
+                <executions>
+                    <execution>
+                        <id>integration</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <!--
+                                note that the groups/excluded groups
+                                don't work due to some problem in
+                                surefire or testng. instead, we have to
+                                exclude via file path
+                                <groups>integration</groups>
+                                <excludedGroups>unit,performance,live</excludedGroups>
+                            -->
+                            <excludes>
+                                <exclude>**/*LiveTest.java</exclude>
+                                <exclude>**/Base*Test.java</exclude>
+                            </excludes>
+                            <includes>
+                                <include>**/*IntegrationTest.java</include>
+                            </includes>
+                            <systemProperties>
+                                <property>
+                                    <name>jclouds.test.initializer</name>
+                                    <value>org.jclouds.blobstore.integration.StubTestInitializer</value>
+                                </property>
+                                <property>
+                                    <name>jclouds.blobstore.httpstream.url</name>
+                                    <value>${jclouds.blobstore.httpstream.url}</value>
+                                </property>
+                                <property>
+                                    <name>jclouds.blobstore.httpstream.md5</name>
+                                    <value>${jclouds.blobstore.httpstream.md5}</value>
+                                </property>
+                            </systemProperties>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <!--
+                        note that the groups/excluded groups don't work
+                        due to some problem in surefire or testng.
+                        instead, we have to exclude via file path
+                        <groups>unit,performance</groups>
+                        <excludedGroups>integration,live</excludedGroups>
+                    -->
+                    <excludes>
+                        <exclude>**/*IntegrationTest.java</exclude>
+                        <exclude>**/*LiveTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/BlobMap.java b/core/src/main/java/org/jclouds/blobstore/BlobMap.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/BlobMap.java
rename to core/src/main/java/org/jclouds/blobstore/BlobMap.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/BlobStore.java b/core/src/main/java/org/jclouds/blobstore/BlobStore.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/BlobStore.java
rename to core/src/main/java/org/jclouds/blobstore/BlobStore.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/BlobStoreContext.java b/core/src/main/java/org/jclouds/blobstore/BlobStoreContext.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/BlobStoreContext.java
rename to core/src/main/java/org/jclouds/blobstore/BlobStoreContext.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/BlobStoreContextBuilder.java b/core/src/main/java/org/jclouds/blobstore/BlobStoreContextBuilder.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/BlobStoreContextBuilder.java
rename to core/src/main/java/org/jclouds/blobstore/BlobStoreContextBuilder.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/BlobStorePropertiesBuilder.java b/core/src/main/java/org/jclouds/blobstore/BlobStorePropertiesBuilder.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/BlobStorePropertiesBuilder.java
rename to core/src/main/java/org/jclouds/blobstore/BlobStorePropertiesBuilder.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/ContainerNotFoundException.java b/core/src/main/java/org/jclouds/blobstore/ContainerNotFoundException.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/ContainerNotFoundException.java
rename to core/src/main/java/org/jclouds/blobstore/ContainerNotFoundException.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/InputStreamMap.java b/core/src/main/java/org/jclouds/blobstore/InputStreamMap.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/InputStreamMap.java
rename to core/src/main/java/org/jclouds/blobstore/InputStreamMap.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/KeyAlreadyExistsException.java b/core/src/main/java/org/jclouds/blobstore/KeyAlreadyExistsException.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/KeyAlreadyExistsException.java
rename to core/src/main/java/org/jclouds/blobstore/KeyAlreadyExistsException.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/KeyNotFoundException.java b/core/src/main/java/org/jclouds/blobstore/KeyNotFoundException.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/KeyNotFoundException.java
rename to core/src/main/java/org/jclouds/blobstore/KeyNotFoundException.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/ListableMap.java b/core/src/main/java/org/jclouds/blobstore/ListableMap.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/ListableMap.java
rename to core/src/main/java/org/jclouds/blobstore/ListableMap.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/attr/BlobCapabilities.java b/core/src/main/java/org/jclouds/blobstore/attr/BlobCapabilities.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/attr/BlobCapabilities.java
rename to core/src/main/java/org/jclouds/blobstore/attr/BlobCapabilities.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/attr/BlobCapability.java b/core/src/main/java/org/jclouds/blobstore/attr/BlobCapability.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/attr/BlobCapability.java
rename to core/src/main/java/org/jclouds/blobstore/attr/BlobCapability.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/attr/BlobScope.java b/core/src/main/java/org/jclouds/blobstore/attr/BlobScope.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/attr/BlobScope.java
rename to core/src/main/java/org/jclouds/blobstore/attr/BlobScope.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/attr/BlobScopes.java b/core/src/main/java/org/jclouds/blobstore/attr/BlobScopes.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/attr/BlobScopes.java
rename to core/src/main/java/org/jclouds/blobstore/attr/BlobScopes.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/attr/Charge.java b/core/src/main/java/org/jclouds/blobstore/attr/Charge.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/attr/Charge.java
rename to core/src/main/java/org/jclouds/blobstore/attr/Charge.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/attr/Charges.java b/core/src/main/java/org/jclouds/blobstore/attr/Charges.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/attr/Charges.java
rename to core/src/main/java/org/jclouds/blobstore/attr/Charges.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/attr/ConsistencyModel.java b/core/src/main/java/org/jclouds/blobstore/attr/ConsistencyModel.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/attr/ConsistencyModel.java
rename to core/src/main/java/org/jclouds/blobstore/attr/ConsistencyModel.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/attr/ConsistencyModels.java b/core/src/main/java/org/jclouds/blobstore/attr/ConsistencyModels.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/attr/ConsistencyModels.java
rename to core/src/main/java/org/jclouds/blobstore/attr/ConsistencyModels.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/attr/ContainerCapabilities.java b/core/src/main/java/org/jclouds/blobstore/attr/ContainerCapabilities.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/attr/ContainerCapabilities.java
rename to core/src/main/java/org/jclouds/blobstore/attr/ContainerCapabilities.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/attr/ContainerCapability.java b/core/src/main/java/org/jclouds/blobstore/attr/ContainerCapability.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/attr/ContainerCapability.java
rename to core/src/main/java/org/jclouds/blobstore/attr/ContainerCapability.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/attr/ContainerVisibilities.java b/core/src/main/java/org/jclouds/blobstore/attr/ContainerVisibilities.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/attr/ContainerVisibilities.java
rename to core/src/main/java/org/jclouds/blobstore/attr/ContainerVisibilities.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/attr/ContainerVisibility.java b/core/src/main/java/org/jclouds/blobstore/attr/ContainerVisibility.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/attr/ContainerVisibility.java
rename to core/src/main/java/org/jclouds/blobstore/attr/ContainerVisibility.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/attr/FolderCapability.java b/core/src/main/java/org/jclouds/blobstore/attr/FolderCapability.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/attr/FolderCapability.java
rename to core/src/main/java/org/jclouds/blobstore/attr/FolderCapability.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/binders/BindBlobToEntity.java b/core/src/main/java/org/jclouds/blobstore/binders/BindBlobToEntity.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/binders/BindBlobToEntity.java
rename to core/src/main/java/org/jclouds/blobstore/binders/BindBlobToEntity.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/binders/BindBlobToEntityAndUserMetadataToHeadersWithPrefix.java b/core/src/main/java/org/jclouds/blobstore/binders/BindBlobToEntityAndUserMetadataToHeadersWithPrefix.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/binders/BindBlobToEntityAndUserMetadataToHeadersWithPrefix.java
rename to core/src/main/java/org/jclouds/blobstore/binders/BindBlobToEntityAndUserMetadataToHeadersWithPrefix.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/binders/BindBlobToMultipartForm.java b/core/src/main/java/org/jclouds/blobstore/binders/BindBlobToMultipartForm.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/binders/BindBlobToMultipartForm.java
rename to core/src/main/java/org/jclouds/blobstore/binders/BindBlobToMultipartForm.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/binders/BindMapToHeadersWithPrefix.java b/core/src/main/java/org/jclouds/blobstore/binders/BindMapToHeadersWithPrefix.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/binders/BindMapToHeadersWithPrefix.java
rename to core/src/main/java/org/jclouds/blobstore/binders/BindMapToHeadersWithPrefix.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/config/BlobStoreMapModule.java b/core/src/main/java/org/jclouds/blobstore/config/BlobStoreMapModule.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/config/BlobStoreMapModule.java
rename to core/src/main/java/org/jclouds/blobstore/config/BlobStoreMapModule.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/config/BlobStoreObjectModule.java b/core/src/main/java/org/jclouds/blobstore/config/BlobStoreObjectModule.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/config/BlobStoreObjectModule.java
rename to core/src/main/java/org/jclouds/blobstore/config/BlobStoreObjectModule.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/domain/Blob.java b/core/src/main/java/org/jclouds/blobstore/domain/Blob.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/domain/Blob.java
rename to core/src/main/java/org/jclouds/blobstore/domain/Blob.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/domain/BlobMetadata.java b/core/src/main/java/org/jclouds/blobstore/domain/BlobMetadata.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/domain/BlobMetadata.java
rename to core/src/main/java/org/jclouds/blobstore/domain/BlobMetadata.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/domain/ListContainerResponse.java b/core/src/main/java/org/jclouds/blobstore/domain/ListContainerResponse.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/domain/ListContainerResponse.java
rename to core/src/main/java/org/jclouds/blobstore/domain/ListContainerResponse.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/domain/ListResponse.java b/core/src/main/java/org/jclouds/blobstore/domain/ListResponse.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/domain/ListResponse.java
rename to core/src/main/java/org/jclouds/blobstore/domain/ListResponse.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/domain/MD5InputStreamResult.java b/core/src/main/java/org/jclouds/blobstore/domain/MD5InputStreamResult.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/domain/MD5InputStreamResult.java
rename to core/src/main/java/org/jclouds/blobstore/domain/MD5InputStreamResult.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/domain/MutableBlobMetadata.java b/core/src/main/java/org/jclouds/blobstore/domain/MutableBlobMetadata.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/domain/MutableBlobMetadata.java
rename to core/src/main/java/org/jclouds/blobstore/domain/MutableBlobMetadata.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/domain/MutableResourceMetadata.java b/core/src/main/java/org/jclouds/blobstore/domain/MutableResourceMetadata.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/domain/MutableResourceMetadata.java
rename to core/src/main/java/org/jclouds/blobstore/domain/MutableResourceMetadata.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/domain/ResourceMetadata.java b/core/src/main/java/org/jclouds/blobstore/domain/ResourceMetadata.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/domain/ResourceMetadata.java
rename to core/src/main/java/org/jclouds/blobstore/domain/ResourceMetadata.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/domain/ResourceType.java b/core/src/main/java/org/jclouds/blobstore/domain/ResourceType.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/domain/ResourceType.java
rename to core/src/main/java/org/jclouds/blobstore/domain/ResourceType.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/domain/internal/BlobImpl.java b/core/src/main/java/org/jclouds/blobstore/domain/internal/BlobImpl.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/domain/internal/BlobImpl.java
rename to core/src/main/java/org/jclouds/blobstore/domain/internal/BlobImpl.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java b/core/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java
rename to core/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/domain/internal/ListContainerResponseImpl.java b/core/src/main/java/org/jclouds/blobstore/domain/internal/ListContainerResponseImpl.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/domain/internal/ListContainerResponseImpl.java
rename to core/src/main/java/org/jclouds/blobstore/domain/internal/ListContainerResponseImpl.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/domain/internal/ListResponseImpl.java b/core/src/main/java/org/jclouds/blobstore/domain/internal/ListResponseImpl.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/domain/internal/ListResponseImpl.java
rename to core/src/main/java/org/jclouds/blobstore/domain/internal/ListResponseImpl.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImpl.java b/core/src/main/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImpl.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImpl.java
rename to core/src/main/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImpl.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/domain/internal/MutableResourceMetadataImpl.java b/core/src/main/java/org/jclouds/blobstore/domain/internal/MutableResourceMetadataImpl.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/domain/internal/MutableResourceMetadataImpl.java
rename to core/src/main/java/org/jclouds/blobstore/domain/internal/MutableResourceMetadataImpl.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/domain/internal/ResourceMetadataImpl.java b/core/src/main/java/org/jclouds/blobstore/domain/internal/ResourceMetadataImpl.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/domain/internal/ResourceMetadataImpl.java
rename to core/src/main/java/org/jclouds/blobstore/domain/internal/ResourceMetadataImpl.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/functions/BlobName.java b/core/src/main/java/org/jclouds/blobstore/functions/BlobName.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/functions/BlobName.java
rename to core/src/main/java/org/jclouds/blobstore/functions/BlobName.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/functions/BlobToHttpGetOptions.java b/core/src/main/java/org/jclouds/blobstore/functions/BlobToHttpGetOptions.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/functions/BlobToHttpGetOptions.java
rename to core/src/main/java/org/jclouds/blobstore/functions/BlobToHttpGetOptions.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/functions/CalculateSize.java b/core/src/main/java/org/jclouds/blobstore/functions/CalculateSize.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/functions/CalculateSize.java
rename to core/src/main/java/org/jclouds/blobstore/functions/CalculateSize.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/functions/ClearAndDeleteIfNotEmpty.java b/core/src/main/java/org/jclouds/blobstore/functions/ClearAndDeleteIfNotEmpty.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/functions/ClearAndDeleteIfNotEmpty.java
rename to core/src/main/java/org/jclouds/blobstore/functions/ClearAndDeleteIfNotEmpty.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/functions/GenerateMD5.java b/core/src/main/java/org/jclouds/blobstore/functions/GenerateMD5.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/functions/GenerateMD5.java
rename to core/src/main/java/org/jclouds/blobstore/functions/GenerateMD5.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/functions/GenerateMD5Result.java b/core/src/main/java/org/jclouds/blobstore/functions/GenerateMD5Result.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/functions/GenerateMD5Result.java
rename to core/src/main/java/org/jclouds/blobstore/functions/GenerateMD5Result.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/functions/HttpGetOptionsListToGetOptions.java b/core/src/main/java/org/jclouds/blobstore/functions/HttpGetOptionsListToGetOptions.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/functions/HttpGetOptionsListToGetOptions.java
rename to core/src/main/java/org/jclouds/blobstore/functions/HttpGetOptionsListToGetOptions.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/functions/ObjectMD5.java b/core/src/main/java/org/jclouds/blobstore/functions/ObjectMD5.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/functions/ObjectMD5.java
rename to core/src/main/java/org/jclouds/blobstore/functions/ObjectMD5.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContent.java b/core/src/main/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContent.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContent.java
rename to core/src/main/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContent.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeaders.java b/core/src/main/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeaders.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeaders.java
rename to core/src/main/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeaders.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/functions/ReturnVoidOnNotFoundOr404.java b/core/src/main/java/org/jclouds/blobstore/functions/ReturnVoidOnNotFoundOr404.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/functions/ReturnVoidOnNotFoundOr404.java
rename to core/src/main/java/org/jclouds/blobstore/functions/ReturnVoidOnNotFoundOr404.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/functions/ThrowContainerNotFoundOn404.java b/core/src/main/java/org/jclouds/blobstore/functions/ThrowContainerNotFoundOn404.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/functions/ThrowContainerNotFoundOn404.java
rename to core/src/main/java/org/jclouds/blobstore/functions/ThrowContainerNotFoundOn404.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/functions/ThrowKeyNotFoundOn404.java b/core/src/main/java/org/jclouds/blobstore/functions/ThrowKeyNotFoundOn404.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/functions/ThrowKeyNotFoundOn404.java
rename to core/src/main/java/org/jclouds/blobstore/functions/ThrowKeyNotFoundOn404.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/functions/impl/BouncyCastleGenerateMD5.java b/core/src/main/java/org/jclouds/blobstore/functions/impl/BouncyCastleGenerateMD5.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/functions/impl/BouncyCastleGenerateMD5.java
rename to core/src/main/java/org/jclouds/blobstore/functions/impl/BouncyCastleGenerateMD5.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/functions/impl/BouncyCastleGenerateMD5Result.java b/core/src/main/java/org/jclouds/blobstore/functions/impl/BouncyCastleGenerateMD5Result.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/functions/impl/BouncyCastleGenerateMD5Result.java
rename to core/src/main/java/org/jclouds/blobstore/functions/impl/BouncyCastleGenerateMD5Result.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/functions/impl/CalculateSizeByLength.java b/core/src/main/java/org/jclouds/blobstore/functions/impl/CalculateSizeByLength.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/functions/impl/CalculateSizeByLength.java
rename to core/src/main/java/org/jclouds/blobstore/functions/impl/CalculateSizeByLength.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/internal/BaseBlobMap.java b/core/src/main/java/org/jclouds/blobstore/internal/BaseBlobMap.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/internal/BaseBlobMap.java
rename to core/src/main/java/org/jclouds/blobstore/internal/BaseBlobMap.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/internal/BlobMapImpl.java b/core/src/main/java/org/jclouds/blobstore/internal/BlobMapImpl.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/internal/BlobMapImpl.java
rename to core/src/main/java/org/jclouds/blobstore/internal/BlobMapImpl.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/internal/BlobRuntimeException.java b/core/src/main/java/org/jclouds/blobstore/internal/BlobRuntimeException.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/internal/BlobRuntimeException.java
rename to core/src/main/java/org/jclouds/blobstore/internal/BlobRuntimeException.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/internal/BlobStoreContextImpl.java b/core/src/main/java/org/jclouds/blobstore/internal/BlobStoreContextImpl.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/internal/BlobStoreContextImpl.java
rename to core/src/main/java/org/jclouds/blobstore/internal/BlobStoreContextImpl.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/internal/InputStreamMapImpl.java b/core/src/main/java/org/jclouds/blobstore/internal/InputStreamMapImpl.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/internal/InputStreamMapImpl.java
rename to core/src/main/java/org/jclouds/blobstore/internal/InputStreamMapImpl.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/options/GetOptions.java b/core/src/main/java/org/jclouds/blobstore/options/GetOptions.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/options/GetOptions.java
rename to core/src/main/java/org/jclouds/blobstore/options/GetOptions.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/options/ListContainerOptions.java b/core/src/main/java/org/jclouds/blobstore/options/ListContainerOptions.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/options/ListContainerOptions.java
rename to core/src/main/java/org/jclouds/blobstore/options/ListContainerOptions.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/options/ListOptions.java b/core/src/main/java/org/jclouds/blobstore/options/ListOptions.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/options/ListOptions.java
rename to core/src/main/java/org/jclouds/blobstore/options/ListOptions.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/reference/BlobStoreConstants.java b/core/src/main/java/org/jclouds/blobstore/reference/BlobStoreConstants.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/reference/BlobStoreConstants.java
rename to core/src/main/java/org/jclouds/blobstore/reference/BlobStoreConstants.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/reference/package-info.java b/core/src/main/java/org/jclouds/blobstore/reference/package-info.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/reference/package-info.java
rename to core/src/main/java/org/jclouds/blobstore/reference/package-info.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/strategy/ClearContainerStrategy.java b/core/src/main/java/org/jclouds/blobstore/strategy/ClearContainerStrategy.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/strategy/ClearContainerStrategy.java
rename to core/src/main/java/org/jclouds/blobstore/strategy/ClearContainerStrategy.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/strategy/ClearListStrategy.java b/core/src/main/java/org/jclouds/blobstore/strategy/ClearListStrategy.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/strategy/ClearListStrategy.java
rename to core/src/main/java/org/jclouds/blobstore/strategy/ClearListStrategy.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/strategy/ContainsValueInListStrategy.java b/core/src/main/java/org/jclouds/blobstore/strategy/ContainsValueInListStrategy.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/strategy/ContainsValueInListStrategy.java
rename to core/src/main/java/org/jclouds/blobstore/strategy/ContainsValueInListStrategy.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/strategy/CountListStrategy.java b/core/src/main/java/org/jclouds/blobstore/strategy/CountListStrategy.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/strategy/CountListStrategy.java
rename to core/src/main/java/org/jclouds/blobstore/strategy/CountListStrategy.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/strategy/GetBlobsInListStrategy.java b/core/src/main/java/org/jclouds/blobstore/strategy/GetBlobsInListStrategy.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/strategy/GetBlobsInListStrategy.java
rename to core/src/main/java/org/jclouds/blobstore/strategy/GetBlobsInListStrategy.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/strategy/ListBlobMetadataStrategy.java b/core/src/main/java/org/jclouds/blobstore/strategy/ListBlobMetadataStrategy.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/strategy/ListBlobMetadataStrategy.java
rename to core/src/main/java/org/jclouds/blobstore/strategy/ListBlobMetadataStrategy.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/strategy/internal/CountBlobTypeInList.java b/core/src/main/java/org/jclouds/blobstore/strategy/internal/CountBlobTypeInList.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/strategy/internal/CountBlobTypeInList.java
rename to core/src/main/java/org/jclouds/blobstore/strategy/internal/CountBlobTypeInList.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java b/core/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java
rename to core/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/strategy/internal/FindMD5InList.java b/core/src/main/java/org/jclouds/blobstore/strategy/internal/FindMD5InList.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/strategy/internal/FindMD5InList.java
rename to core/src/main/java/org/jclouds/blobstore/strategy/internal/FindMD5InList.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/strategy/internal/GetAllBlobsInListAndRetryOnFailure.java b/core/src/main/java/org/jclouds/blobstore/strategy/internal/GetAllBlobsInListAndRetryOnFailure.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/strategy/internal/GetAllBlobsInListAndRetryOnFailure.java
rename to core/src/main/java/org/jclouds/blobstore/strategy/internal/GetAllBlobsInListAndRetryOnFailure.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/strategy/internal/ListBlobMetadataInContainer.java b/core/src/main/java/org/jclouds/blobstore/strategy/internal/ListBlobMetadataInContainer.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/strategy/internal/ListBlobMetadataInContainer.java
rename to core/src/main/java/org/jclouds/blobstore/strategy/internal/ListBlobMetadataInContainer.java
diff --git a/blobstore/core/src/main/java/org/jclouds/blobstore/util/BlobStoreUtils.java b/core/src/main/java/org/jclouds/blobstore/util/BlobStoreUtils.java
similarity index 100%
rename from blobstore/core/src/main/java/org/jclouds/blobstore/util/BlobStoreUtils.java
rename to core/src/main/java/org/jclouds/blobstore/util/BlobStoreUtils.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/binders/BindBlobToMultipartFormTest.java b/core/src/test/java/org/jclouds/blobstore/binders/BindBlobToMultipartFormTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/binders/BindBlobToMultipartFormTest.java
rename to core/src/test/java/org/jclouds/blobstore/binders/BindBlobToMultipartFormTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImplTest.java b/core/src/test/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImplTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImplTest.java
rename to core/src/test/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImplTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java b/core/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java
rename to core/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/functions/ParseBlobMetadataFromHeadersTest.java b/core/src/test/java/org/jclouds/blobstore/functions/ParseBlobMetadataFromHeadersTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/functions/ParseBlobMetadataFromHeadersTest.java
rename to core/src/test/java/org/jclouds/blobstore/functions/ParseBlobMetadataFromHeadersTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubBlobIntegrationTest.java b/core/src/test/java/org/jclouds/blobstore/integration/StubBlobIntegrationTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubBlobIntegrationTest.java
rename to core/src/test/java/org/jclouds/blobstore/integration/StubBlobIntegrationTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubBlobMapIntegrationTest.java b/core/src/test/java/org/jclouds/blobstore/integration/StubBlobMapIntegrationTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubBlobMapIntegrationTest.java
rename to core/src/test/java/org/jclouds/blobstore/integration/StubBlobMapIntegrationTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubBlobStoreContextBuilder.java b/core/src/test/java/org/jclouds/blobstore/integration/StubBlobStoreContextBuilder.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubBlobStoreContextBuilder.java
rename to core/src/test/java/org/jclouds/blobstore/integration/StubBlobStoreContextBuilder.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubContainerIntegrationTest.java b/core/src/test/java/org/jclouds/blobstore/integration/StubContainerIntegrationTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubContainerIntegrationTest.java
rename to core/src/test/java/org/jclouds/blobstore/integration/StubContainerIntegrationTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubInputStreamMapIntegrationTest.java b/core/src/test/java/org/jclouds/blobstore/integration/StubInputStreamMapIntegrationTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubInputStreamMapIntegrationTest.java
rename to core/src/test/java/org/jclouds/blobstore/integration/StubInputStreamMapIntegrationTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubServiceIntegrationTest.java b/core/src/test/java/org/jclouds/blobstore/integration/StubServiceIntegrationTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubServiceIntegrationTest.java
rename to core/src/test/java/org/jclouds/blobstore/integration/StubServiceIntegrationTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubTestInitializer.java b/core/src/test/java/org/jclouds/blobstore/integration/StubTestInitializer.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/integration/StubTestInitializer.java
rename to core/src/test/java/org/jclouds/blobstore/integration/StubTestInitializer.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/config/StubBlobStoreModule.java b/core/src/test/java/org/jclouds/blobstore/integration/config/StubBlobStoreModule.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/integration/config/StubBlobStoreModule.java
rename to core/src/test/java/org/jclouds/blobstore/integration/config/StubBlobStoreModule.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java b/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
rename to core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobLiveTest.java b/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobLiveTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobLiveTest.java
rename to core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobLiveTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobMapIntegrationTest.java b/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobMapIntegrationTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobMapIntegrationTest.java
rename to core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobMapIntegrationTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java b/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java
rename to core/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java b/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java
rename to core/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java b/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java
rename to core/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseInputStreamMapIntegrationTest.java b/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseInputStreamMapIntegrationTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseInputStreamMapIntegrationTest.java
rename to core/src/test/java/org/jclouds/blobstore/integration/internal/BaseInputStreamMapIntegrationTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseMapIntegrationTest.java b/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseMapIntegrationTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseMapIntegrationTest.java
rename to core/src/test/java/org/jclouds/blobstore/integration/internal/BaseMapIntegrationTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseServiceIntegrationTest.java b/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseServiceIntegrationTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseServiceIntegrationTest.java
rename to core/src/test/java/org/jclouds/blobstore/integration/internal/BaseServiceIntegrationTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java b/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java
rename to core/src/test/java/org/jclouds/blobstore/integration/internal/BaseTestInitializer.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/StubBlobStore.java b/core/src/test/java/org/jclouds/blobstore/integration/internal/StubBlobStore.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/integration/internal/StubBlobStore.java
rename to core/src/test/java/org/jclouds/blobstore/integration/internal/StubBlobStore.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/internal/BaseBlobMapTest.java b/core/src/test/java/org/jclouds/blobstore/internal/BaseBlobMapTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/internal/BaseBlobMapTest.java
rename to core/src/test/java/org/jclouds/blobstore/internal/BaseBlobMapTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/options/GetOptionsTest.java b/core/src/test/java/org/jclouds/blobstore/options/GetOptionsTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/options/GetOptionsTest.java
rename to core/src/test/java/org/jclouds/blobstore/options/GetOptionsTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/options/ListOptionsTest.java b/core/src/test/java/org/jclouds/blobstore/options/ListOptionsTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/options/ListOptionsTest.java
rename to core/src/test/java/org/jclouds/blobstore/options/ListOptionsTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/strategy/internal/RetryOnNotFoundGetAllBlobsStrategyTest.java b/core/src/test/java/org/jclouds/blobstore/strategy/internal/RetryOnNotFoundGetAllBlobsStrategyTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/strategy/internal/RetryOnNotFoundGetAllBlobsStrategyTest.java
rename to core/src/test/java/org/jclouds/blobstore/strategy/internal/RetryOnNotFoundGetAllBlobsStrategyTest.java
diff --git a/blobstore/core/src/test/java/org/jclouds/blobstore/util/BlobStoreUtilsTest.java b/core/src/test/java/org/jclouds/blobstore/util/BlobStoreUtilsTest.java
similarity index 100%
rename from blobstore/core/src/test/java/org/jclouds/blobstore/util/BlobStoreUtilsTest.java
rename to core/src/test/java/org/jclouds/blobstore/util/BlobStoreUtilsTest.java
diff --git a/demos/gae-tweetstore/pom.xml b/demos/gae-tweetstore/pom.xml
index bd0fe4adaf..465706ee9b 100755
--- a/demos/gae-tweetstore/pom.xml
+++ b/demos/gae-tweetstore/pom.xml
@@ -49,12 +49,12 @@
 	<dependencies>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>jclouds-blobstore</artifactId>
+                    <artifactId>jclouds-core</artifactId>
                     <version>${project.version}</version>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>jclouds-blobstore</artifactId>
+                    <artifactId>jclouds-core</artifactId>
                     <version>${project.version}</version>
                     <type>test-jar</type>
                     <scope>test</scope>
diff --git a/extensions/gae/pom.xml b/extensions/gae/pom.xml
index 6e6a1c29b5..5c73e02393 100644
--- a/extensions/gae/pom.xml
+++ b/extensions/gae/pom.xml
@@ -69,12 +69,14 @@
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
+<!--
             <exclusions>
                 <exclusion>
                     <groupId>org.mortbay.jetty</groupId>
                     <artifactId>jetty</artifactId>
                 </exclusion>
             </exclusions>
+-->
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
diff --git a/mezeo/pcs2/pom.xml b/mezeo/pcs2/pom.xml
index ff79a349ed..d7a58d9522 100644
--- a/mezeo/pcs2/pom.xml
+++ b/mezeo/pcs2/pom.xml
@@ -48,12 +48,12 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-blobstore</artifactId>
+            <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-blobstore</artifactId>
+            <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
diff --git a/nirvanix/sdn/pom.xml b/nirvanix/sdn/pom.xml
index 6b8e6cc5af..cd74b529b9 100644
--- a/nirvanix/sdn/pom.xml
+++ b/nirvanix/sdn/pom.xml
@@ -48,12 +48,12 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-blobstore</artifactId>
+            <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-blobstore</artifactId>
+            <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
diff --git a/pom.xml b/pom.xml
index 32b5464eb9..001d9fd7c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,6 @@
         <module>project</module>
         <module>thirdparty</module>
         <module>core</module>
-        <module>blobstore</module>
         <module>extensions</module>
         <module>aws</module>
         <module>azure</module>
diff --git a/rackspace/cloudfiles/pom.xml b/rackspace/cloudfiles/pom.xml
index 876d1ef857..5ada0e9257 100644
--- a/rackspace/cloudfiles/pom.xml
+++ b/rackspace/cloudfiles/pom.xml
@@ -45,12 +45,12 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-blobstore</artifactId>
+            <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-blobstore</artifactId>
+            <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>