diff --git a/labs/openstack-glance/pom.xml b/labs/openstack/openstack-glance/pom.xml
similarity index 97%
rename from labs/openstack-glance/pom.xml
rename to labs/openstack/openstack-glance/pom.xml
index 0468a08816..1b96706942 100644
--- a/labs/openstack-glance/pom.xml
+++ b/labs/openstack/openstack-glance/pom.xml
@@ -25,11 +25,11 @@
     <groupId>org.jclouds</groupId>
     <artifactId>jclouds-project</artifactId>
     <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../../project/pom.xml</relativePath>
+    <relativePath>../../../project/pom.xml</relativePath>
   </parent>
   <groupId>org.jclouds.labs</groupId>
   <artifactId>openstack-glance</artifactId>
-  <name>jcloud openstack-glance api</name>
+  <name>jclouds openstack-glance api</name>
   <description>jclouds components to access an implementation of OpenStack Glance</description>
   <packaging>bundle</packaging>
 
@@ -88,7 +88,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  
+
   <profiles>
     <profile>
       <id>live</id>
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApi.java b/labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApi.java
similarity index 100%
rename from labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApi.java
rename to labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApi.java
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadata.java b/labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadata.java
similarity index 100%
rename from labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadata.java
rename to labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadata.java
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceAsyncApi.java b/labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceAsyncApi.java
similarity index 100%
rename from labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceAsyncApi.java
rename to labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceAsyncApi.java
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceProperties.java b/labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceProperties.java
similarity index 100%
rename from labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceProperties.java
rename to labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceProperties.java
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceRestClientModule.java b/labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceRestClientModule.java
similarity index 100%
rename from labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceRestClientModule.java
rename to labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceRestClientModule.java
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ContainerFormat.java b/labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ContainerFormat.java
similarity index 100%
rename from labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ContainerFormat.java
rename to labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ContainerFormat.java
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/DiskFormat.java b/labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/DiskFormat.java
similarity index 100%
rename from labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/DiskFormat.java
rename to labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/DiskFormat.java
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/Image.java b/labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/Image.java
similarity index 100%
rename from labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/Image.java
rename to labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/Image.java
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ImageDetails.java b/labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ImageDetails.java
similarity index 100%
rename from labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ImageDetails.java
rename to labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ImageDetails.java
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/StoreType.java b/labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/StoreType.java
similarity index 100%
rename from labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/StoreType.java
rename to labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/StoreType.java
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/features/ImageApi.java b/labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/features/ImageApi.java
similarity index 100%
rename from labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/features/ImageApi.java
rename to labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/features/ImageApi.java
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/features/ImageAsyncApi.java b/labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/features/ImageAsyncApi.java
similarity index 100%
rename from labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/features/ImageAsyncApi.java
rename to labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/features/ImageAsyncApi.java
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/ParseImageDetailsFromHeaders.java b/labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/ParseImageDetailsFromHeaders.java
similarity index 100%
rename from labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/ParseImageDetailsFromHeaders.java
rename to labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/ParseImageDetailsFromHeaders.java
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImageDetails.java b/labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImageDetails.java
similarity index 100%
rename from labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImageDetails.java
rename to labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImageDetails.java
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImages.java b/labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImages.java
similarity index 100%
rename from labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImages.java
rename to labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImages.java
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/handlers/GlanceErrorHandler.java b/labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/handlers/GlanceErrorHandler.java
similarity index 100%
rename from labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/handlers/GlanceErrorHandler.java
rename to labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/handlers/GlanceErrorHandler.java
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/CreateImageOptions.java b/labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/CreateImageOptions.java
similarity index 100%
rename from labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/CreateImageOptions.java
rename to labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/CreateImageOptions.java
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/ImageField.java b/labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/ImageField.java
similarity index 100%
rename from labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/ImageField.java
rename to labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/ImageField.java
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/ListImageOptions.java b/labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/ListImageOptions.java
similarity index 100%
rename from labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/ListImageOptions.java
rename to labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/ListImageOptions.java
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/UpdateImageOptions.java b/labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/UpdateImageOptions.java
similarity index 100%
rename from labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/UpdateImageOptions.java
rename to labs/openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/UpdateImageOptions.java
diff --git a/labs/openstack-glance/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/labs/openstack/openstack-glance/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
similarity index 100%
rename from labs/openstack-glance/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
rename to labs/openstack/openstack-glance/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
diff --git a/labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadataTest.java b/labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadataTest.java
similarity index 100%
rename from labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadataTest.java
rename to labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadataTest.java
diff --git a/labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiExpectTest.java b/labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiExpectTest.java
similarity index 100%
rename from labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiExpectTest.java
rename to labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiExpectTest.java
diff --git a/labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiLiveTest.java b/labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiLiveTest.java
similarity index 100%
rename from labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiLiveTest.java
rename to labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiLiveTest.java
diff --git a/labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/functions/ParseImageDetailsFromHeadersTest.java b/labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/functions/ParseImageDetailsFromHeadersTest.java
similarity index 100%
rename from labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/functions/ParseImageDetailsFromHeadersTest.java
rename to labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/functions/ParseImageDetailsFromHeadersTest.java
diff --git a/labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/handlers/GlanceErrorHandlerTest.java b/labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/handlers/GlanceErrorHandlerTest.java
similarity index 100%
rename from labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/handlers/GlanceErrorHandlerTest.java
rename to labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/handlers/GlanceErrorHandlerTest.java
diff --git a/labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceApiExpectTest.java b/labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceApiExpectTest.java
similarity index 100%
rename from labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceApiExpectTest.java
rename to labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceApiExpectTest.java
diff --git a/labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceApiLiveTest.java b/labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceApiLiveTest.java
similarity index 100%
rename from labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceApiLiveTest.java
rename to labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceApiLiveTest.java
diff --git a/labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceAsyncApiExpectTest.java b/labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceAsyncApiExpectTest.java
similarity index 100%
rename from labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceAsyncApiExpectTest.java
rename to labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceAsyncApiExpectTest.java
diff --git a/labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceExpectTest.java b/labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceExpectTest.java
similarity index 100%
rename from labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceExpectTest.java
rename to labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceExpectTest.java
diff --git a/labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImageDetailsTest.java b/labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImageDetailsTest.java
similarity index 100%
rename from labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImageDetailsTest.java
rename to labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImageDetailsTest.java
diff --git a/labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImagesInDetailTest.java b/labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImagesInDetailTest.java
similarity index 100%
rename from labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImagesInDetailTest.java
rename to labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImagesInDetailTest.java
diff --git a/labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImagesTest.java b/labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImagesTest.java
similarity index 100%
rename from labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImagesTest.java
rename to labs/openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImagesTest.java
diff --git a/labs/openstack-glance/src/test/resources/image.json b/labs/openstack/openstack-glance/src/test/resources/image.json
similarity index 100%
rename from labs/openstack-glance/src/test/resources/image.json
rename to labs/openstack/openstack-glance/src/test/resources/image.json
diff --git a/labs/openstack-glance/src/test/resources/images.json b/labs/openstack/openstack-glance/src/test/resources/images.json
similarity index 97%
rename from labs/openstack-glance/src/test/resources/images.json
rename to labs/openstack/openstack-glance/src/test/resources/images.json
index b731788379..29dfb07ce6 100644
--- a/labs/openstack-glance/src/test/resources/images.json
+++ b/labs/openstack/openstack-glance/src/test/resources/images.json
@@ -1,24 +1,24 @@
- {
-     "images": [{
-         "name": "debian",
-         "container_format": "bare",
-         "disk_format": "raw",
-         "checksum": "233afa7b8809d840679b5f0d36d7350a",
-         "id": "f0209a30-25b8-4d9a-8e2f-dbc028e20b2b",
-         "size": 65645798
-     }, {
-         "name": "debian",
-         "container_format": "bare",
-         "disk_format": "raw",
-         "checksum": "233afa7b8809d840679b5f0d36d7350a",
-         "id": "fcc451d0-f6e4-4824-ad8f-70ec12326d07",
-         "size": 65645798
-     }, {
-         "name": "debian",
-         "container_format": "bare",
-         "disk_format": "raw",
-         "checksum": "233afa7b8809d840679b5f0d36d7350a",
-         "id": "f9fcb127-071d-4670-883e-eedb7efac183",
-         "size": 65645798
-     }]
+ {
+     "images": [{
+         "name": "debian",
+         "container_format": "bare",
+         "disk_format": "raw",
+         "checksum": "233afa7b8809d840679b5f0d36d7350a",
+         "id": "f0209a30-25b8-4d9a-8e2f-dbc028e20b2b",
+         "size": 65645798
+     }, {
+         "name": "debian",
+         "container_format": "bare",
+         "disk_format": "raw",
+         "checksum": "233afa7b8809d840679b5f0d36d7350a",
+         "id": "fcc451d0-f6e4-4824-ad8f-70ec12326d07",
+         "size": 65645798
+     }, {
+         "name": "debian",
+         "container_format": "bare",
+         "disk_format": "raw",
+         "checksum": "233afa7b8809d840679b5f0d36d7350a",
+         "id": "f9fcb127-071d-4670-883e-eedb7efac183",
+         "size": 65645798
+     }]
  }
\ No newline at end of file
diff --git a/labs/openstack-glance/src/test/resources/images_detail.json b/labs/openstack/openstack-glance/src/test/resources/images_detail.json
similarity index 96%
rename from labs/openstack-glance/src/test/resources/images_detail.json
rename to labs/openstack/openstack-glance/src/test/resources/images_detail.json
index 8c8c36d35d..98401388bd 100644
--- a/labs/openstack-glance/src/test/resources/images_detail.json
+++ b/labs/openstack/openstack-glance/src/test/resources/images_detail.json
@@ -1,39 +1,39 @@
-{
-    "images": [{
-        "status": "active",
-        "name": "debian",
-        "deleted": false,
-        "container_format": "bare",
-        "created_at": "2012-05-18T18:06:44",
-        "disk_format": "raw",
-        "updated_at": "2012-05-18T18:06:45",
-        "properties": {},
-        "min_disk": 0,
-        "protected": false,
-        "id": "fcc451d0-f6e4-4824-ad8f-70ec12326d07",
-        "checksum": "233afa7b8809d840679b5f0d36d7350a",
-        "owner": "5821675",
-        "is_public": true,
-        "deleted_at": null,
-        "min_ram": 0,
-        "size": 65645798
-    }, {
-        "status": "active",
-        "name": "debian",
-        "deleted": false,
-        "container_format": "bare",
-        "created_at": "2012-05-11T15:04:47",
-        "disk_format": "raw",
-        "updated_at": "2012-05-11T15:04:48",
-        "properties": {},
-        "min_disk": 0,
-        "protected": false,
-        "id": "f9fcb127-071d-4670-883e-eedb7efac183",
-        "checksum": "233afa7b8809d840679b5f0d36d7350a",
-        "owner": "5821675",
-        "is_public": true,
-        "deleted_at": null,
-        "min_ram": 0,
-        "size": 65645798
-    }]
+{
+    "images": [{
+        "status": "active",
+        "name": "debian",
+        "deleted": false,
+        "container_format": "bare",
+        "created_at": "2012-05-18T18:06:44",
+        "disk_format": "raw",
+        "updated_at": "2012-05-18T18:06:45",
+        "properties": {},
+        "min_disk": 0,
+        "protected": false,
+        "id": "fcc451d0-f6e4-4824-ad8f-70ec12326d07",
+        "checksum": "233afa7b8809d840679b5f0d36d7350a",
+        "owner": "5821675",
+        "is_public": true,
+        "deleted_at": null,
+        "min_ram": 0,
+        "size": 65645798
+    }, {
+        "status": "active",
+        "name": "debian",
+        "deleted": false,
+        "container_format": "bare",
+        "created_at": "2012-05-11T15:04:47",
+        "disk_format": "raw",
+        "updated_at": "2012-05-11T15:04:48",
+        "properties": {},
+        "min_disk": 0,
+        "protected": false,
+        "id": "f9fcb127-071d-4670-883e-eedb7efac183",
+        "checksum": "233afa7b8809d840679b5f0d36d7350a",
+        "owner": "5821675",
+        "is_public": true,
+        "deleted_at": null,
+        "min_ram": 0,
+        "size": 65645798
+    }]
 }
\ No newline at end of file
diff --git a/labs/openstack-swift/src/test/resources/logback.xml b/labs/openstack/openstack-glance/src/test/resources/logback.xml
similarity index 96%
rename from labs/openstack-swift/src/test/resources/logback.xml
rename to labs/openstack/openstack-glance/src/test/resources/logback.xml
index bd89efb8c0..a4f81d3fa6 100644
--- a/labs/openstack-swift/src/test/resources/logback.xml
+++ b/labs/openstack/openstack-glance/src/test/resources/logback.xml
@@ -1,51 +1,51 @@
-<?xml version="1.0"?>
-<configuration scan="false">
-    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-        <file>target/test-data/jclouds.log</file>
-
-        <encoder>
-            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
-        </encoder>
-    </appender>
-
-    <appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
-        <file>target/test-data/jclouds-wire.log</file>
-
-        <encoder>
-            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
-        </encoder>
-    </appender>
-
-    <appender name="BLOBSTOREFILE" class="ch.qos.logback.core.FileAppender">
-        <file>target/test-data/jclouds-blobstore.log</file>
-
-        <encoder>
-            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
-        </encoder>
-    </appender>
-    
-    <root>
-        <level value="warn" />
-    </root>
-
-    <logger name="org.jclouds">
-        <level value="DEBUG" />
-        <appender-ref ref="FILE" />
-    </logger>
-
-    <logger name="jclouds.wire">
-        <level value="DEBUG" />
-        <appender-ref ref="WIREFILE" />
-    </logger>
-
-    <logger name="jclouds.headers">
-        <level value="DEBUG" />
-        <appender-ref ref="WIREFILE" />
-    </logger>
-
-    <logger name="jclouds.blobstore">
-        <level value="DEBUG" />
-        <appender-ref ref="BLOBSTOREFILE" />
-    </logger>
-
-</configuration>
+<?xml version="1.0"?>
+<configuration scan="false">
+    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+        <file>target/test-data/jclouds.log</file>
+
+        <encoder>
+            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
+        </encoder>
+    </appender>
+
+    <appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
+        <file>target/test-data/jclouds-wire.log</file>
+
+        <encoder>
+            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
+        </encoder>
+    </appender>
+
+    <appender name="BLOBSTOREFILE" class="ch.qos.logback.core.FileAppender">
+        <file>target/test-data/jclouds-blobstore.log</file>
+
+        <encoder>
+            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
+        </encoder>
+    </appender>
+    
+    <root>
+        <level value="warn" />
+    </root>
+
+    <logger name="org.jclouds">
+        <level value="DEBUG" />
+        <appender-ref ref="FILE" />
+    </logger>
+
+    <logger name="jclouds.wire">
+        <level value="DEBUG" />
+        <appender-ref ref="WIREFILE" />
+    </logger>
+
+    <logger name="jclouds.headers">
+        <level value="DEBUG" />
+        <appender-ref ref="WIREFILE" />
+    </logger>
+
+    <logger name="jclouds.blobstore">
+        <level value="DEBUG" />
+        <appender-ref ref="BLOBSTOREFILE" />
+    </logger>
+
+</configuration>
diff --git a/labs/openstack-quantum/pom.xml b/labs/openstack/openstack-quantum/pom.xml
similarity index 97%
rename from labs/openstack-quantum/pom.xml
rename to labs/openstack/openstack-quantum/pom.xml
index 56bac9b284..a121360844 100644
--- a/labs/openstack-quantum/pom.xml
+++ b/labs/openstack/openstack-quantum/pom.xml
@@ -25,11 +25,11 @@
     <groupId>org.jclouds</groupId>
     <artifactId>jclouds-project</artifactId>
     <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../../project/pom.xml</relativePath>
+    <relativePath>../../../project/pom.xml</relativePath>
   </parent>
   <groupId>org.jclouds.labs</groupId>
   <artifactId>openstack-quantum</artifactId>
-  <name>jcloud openstack-quantum api</name>
+  <name>jclouds openstack-quantum api</name>
   <description>jclouds components to access an implementation of OpenStack Quantum</description>
   <packaging>bundle</packaging>
 
@@ -87,7 +87,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  
+
   <profiles>
     <profile>
       <id>live</id>
diff --git a/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumApi.java b/labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumApi.java
similarity index 100%
rename from labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumApi.java
rename to labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumApi.java
diff --git a/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumApiMetadata.java b/labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumApiMetadata.java
similarity index 100%
rename from labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumApiMetadata.java
rename to labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumApiMetadata.java
diff --git a/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumAsyncApi.java b/labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumAsyncApi.java
similarity index 100%
rename from labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumAsyncApi.java
rename to labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumAsyncApi.java
diff --git a/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/config/QuantumProperties.java b/labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/config/QuantumProperties.java
similarity index 100%
rename from labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/config/QuantumProperties.java
rename to labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/config/QuantumProperties.java
diff --git a/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/config/QuantumRestClientModule.java b/labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/config/QuantumRestClientModule.java
similarity index 100%
rename from labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/config/QuantumRestClientModule.java
rename to labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/config/QuantumRestClientModule.java
diff --git a/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/Attachment.java b/labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/Attachment.java
similarity index 100%
rename from labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/Attachment.java
rename to labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/Attachment.java
diff --git a/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/Network.java b/labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/Network.java
similarity index 100%
rename from labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/Network.java
rename to labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/Network.java
diff --git a/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/NetworkDetails.java b/labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/NetworkDetails.java
similarity index 100%
rename from labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/NetworkDetails.java
rename to labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/NetworkDetails.java
diff --git a/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/Port.java b/labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/Port.java
similarity index 100%
rename from labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/Port.java
rename to labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/Port.java
diff --git a/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/PortDetails.java b/labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/PortDetails.java
similarity index 100%
rename from labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/PortDetails.java
rename to labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/PortDetails.java
diff --git a/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/Reference.java b/labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/Reference.java
similarity index 100%
rename from labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/Reference.java
rename to labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/Reference.java
diff --git a/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApi.java b/labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApi.java
similarity index 100%
rename from labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApi.java
rename to labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApi.java
diff --git a/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/features/NetworkAsyncApi.java b/labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/features/NetworkAsyncApi.java
similarity index 100%
rename from labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/features/NetworkAsyncApi.java
rename to labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/features/NetworkAsyncApi.java
diff --git a/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/features/PortApi.java b/labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/features/PortApi.java
similarity index 100%
rename from labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/features/PortApi.java
rename to labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/features/PortApi.java
diff --git a/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/features/PortAsyncApi.java b/labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/features/PortAsyncApi.java
similarity index 100%
rename from labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/features/PortAsyncApi.java
rename to labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/features/PortAsyncApi.java
diff --git a/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/handlers/QuantumErrorHandler.java b/labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/handlers/QuantumErrorHandler.java
similarity index 100%
rename from labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/handlers/QuantumErrorHandler.java
rename to labs/openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/handlers/QuantumErrorHandler.java
diff --git a/labs/openstack-quantum/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/labs/openstack/openstack-quantum/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
similarity index 100%
rename from labs/openstack-quantum/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
rename to labs/openstack/openstack-quantum/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
diff --git a/labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/QuantumApiMetadataTest.java b/labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/QuantumApiMetadataTest.java
similarity index 100%
rename from labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/QuantumApiMetadataTest.java
rename to labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/QuantumApiMetadataTest.java
diff --git a/labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApiExpectTest.java b/labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApiExpectTest.java
similarity index 100%
rename from labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApiExpectTest.java
rename to labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApiExpectTest.java
diff --git a/labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApiLiveTest.java b/labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApiLiveTest.java
similarity index 100%
rename from labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApiLiveTest.java
rename to labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApiLiveTest.java
diff --git a/labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/PortApiExpectTest.java b/labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/PortApiExpectTest.java
similarity index 100%
rename from labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/PortApiExpectTest.java
rename to labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/PortApiExpectTest.java
diff --git a/labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/PortApiLiveTest.java b/labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/PortApiLiveTest.java
similarity index 100%
rename from labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/PortApiLiveTest.java
rename to labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/PortApiLiveTest.java
diff --git a/labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/internal/BaseQuantumApiExpectTest.java b/labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/internal/BaseQuantumApiExpectTest.java
similarity index 100%
rename from labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/internal/BaseQuantumApiExpectTest.java
rename to labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/internal/BaseQuantumApiExpectTest.java
diff --git a/labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/internal/BaseQuantumApiLiveTest.java b/labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/internal/BaseQuantumApiLiveTest.java
similarity index 100%
rename from labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/internal/BaseQuantumApiLiveTest.java
rename to labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/internal/BaseQuantumApiLiveTest.java
diff --git a/labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/internal/BaseQuantumExpectTest.java b/labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/internal/BaseQuantumExpectTest.java
similarity index 100%
rename from labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/internal/BaseQuantumExpectTest.java
rename to labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/internal/BaseQuantumExpectTest.java
diff --git a/labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParseAttachmentTest.java b/labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParseAttachmentTest.java
similarity index 100%
rename from labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParseAttachmentTest.java
rename to labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParseAttachmentTest.java
diff --git a/labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParseNetworkDetailsTest.java b/labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParseNetworkDetailsTest.java
similarity index 100%
rename from labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParseNetworkDetailsTest.java
rename to labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParseNetworkDetailsTest.java
diff --git a/labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParseNetworkTest.java b/labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParseNetworkTest.java
similarity index 100%
rename from labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParseNetworkTest.java
rename to labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParseNetworkTest.java
diff --git a/labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParsePortDetailsTest.java b/labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParsePortDetailsTest.java
similarity index 100%
rename from labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParsePortDetailsTest.java
rename to labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParsePortDetailsTest.java
diff --git a/labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParsePortTest.java b/labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParsePortTest.java
similarity index 100%
rename from labs/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParsePortTest.java
rename to labs/openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParsePortTest.java
diff --git a/labs/openstack-quantum/src/test/resources/attachment.json b/labs/openstack/openstack-quantum/src/test/resources/attachment.json
similarity index 100%
rename from labs/openstack-quantum/src/test/resources/attachment.json
rename to labs/openstack/openstack-quantum/src/test/resources/attachment.json
diff --git a/labs/openstack-quantum/src/test/resources/list_network_refs.json b/labs/openstack/openstack-quantum/src/test/resources/list_network_refs.json
similarity index 100%
rename from labs/openstack-quantum/src/test/resources/list_network_refs.json
rename to labs/openstack/openstack-quantum/src/test/resources/list_network_refs.json
diff --git a/labs/openstack-quantum/src/test/resources/list_networks.json b/labs/openstack/openstack-quantum/src/test/resources/list_networks.json
similarity index 100%
rename from labs/openstack-quantum/src/test/resources/list_networks.json
rename to labs/openstack/openstack-quantum/src/test/resources/list_networks.json
diff --git a/labs/openstack-quantum/src/test/resources/logback.xml b/labs/openstack/openstack-quantum/src/test/resources/logback.xml
similarity index 96%
rename from labs/openstack-quantum/src/test/resources/logback.xml
rename to labs/openstack/openstack-quantum/src/test/resources/logback.xml
index e4ba99b357..a36c4c6749 100644
--- a/labs/openstack-quantum/src/test/resources/logback.xml
+++ b/labs/openstack/openstack-quantum/src/test/resources/logback.xml
@@ -1,51 +1,51 @@
-<?xml version="1.0"?>
-<configuration scan="false">
-    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-        <file>target/test-data/jclouds.log</file>
-
-        <encoder>
-            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
-        </encoder>
-    </appender>
-
-    <appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
-        <file>target/test-data/jclouds-wire.log</file>
-
-        <encoder>
-            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
-        </encoder>
-    </appender>
-
-    <appender name="BLOBSTOREFILE" class="ch.qos.logback.core.FileAppender">
-        <file>target/test-data/jclouds-blobstore.log</file>
-
-        <encoder>
-            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
-        </encoder>
-    </appender>
-
-    <root>
-        <level value="warn" />
-    </root>
-
-    <logger name="org.jclouds">
-        <level value="DEBUG" />
-        <appender-ref ref="FILE" />
-    </logger>
-
-    <logger name="jclouds.wire">
-        <level value="DEBUG" />
-        <appender-ref ref="WIREFILE" />
-    </logger>
-
-    <logger name="jclouds.headers">
-        <level value="DEBUG" />
-        <appender-ref ref="WIREFILE" />
-    </logger>
-
-    <logger name="jclouds.blobstore">
-        <level value="DEBUG" />
-        <appender-ref ref="BLOBSTOREFILE" />
-    </logger>
-
-</configuration>
+<?xml version="1.0"?>
+<configuration scan="false">
+    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+        <file>target/test-data/jclouds.log</file>
+
+        <encoder>
+            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
+        </encoder>
+    </appender>
+
+    <appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
+        <file>target/test-data/jclouds-wire.log</file>
+
+        <encoder>
+            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
+        </encoder>
+    </appender>
+
+    <appender name="BLOBSTOREFILE" class="ch.qos.logback.core.FileAppender">
+        <file>target/test-data/jclouds-blobstore.log</file>
+
+        <encoder>
+            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
+        </encoder>
+    </appender>
+
+    <root>
+        <level value="warn" />
+    </root>
+
+    <logger name="org.jclouds">
+        <level value="DEBUG" />
+        <appender-ref ref="FILE" />
+    </logger>
+
+    <logger name="jclouds.wire">
+        <level value="DEBUG" />
+        <appender-ref ref="WIREFILE" />
+    </logger>
+
+    <logger name="jclouds.headers">
+        <level value="DEBUG" />
+        <appender-ref ref="WIREFILE" />
+    </logger>
+
+    <logger name="jclouds.blobstore">
+        <level value="DEBUG" />
+        <appender-ref ref="BLOBSTOREFILE" />
+    </logger>
+
+</configuration>
diff --git a/labs/openstack-quantum/src/test/resources/network.json b/labs/openstack/openstack-quantum/src/test/resources/network.json
similarity index 100%
rename from labs/openstack-quantum/src/test/resources/network.json
rename to labs/openstack/openstack-quantum/src/test/resources/network.json
diff --git a/labs/openstack-quantum/src/test/resources/network_details.json b/labs/openstack/openstack-quantum/src/test/resources/network_details.json
similarity index 100%
rename from labs/openstack-quantum/src/test/resources/network_details.json
rename to labs/openstack/openstack-quantum/src/test/resources/network_details.json
diff --git a/labs/openstack-quantum/src/test/resources/port.json b/labs/openstack/openstack-quantum/src/test/resources/port.json
similarity index 100%
rename from labs/openstack-quantum/src/test/resources/port.json
rename to labs/openstack/openstack-quantum/src/test/resources/port.json
diff --git a/labs/openstack-quantum/src/test/resources/port_details.json b/labs/openstack/openstack-quantum/src/test/resources/port_details.json
similarity index 100%
rename from labs/openstack-quantum/src/test/resources/port_details.json
rename to labs/openstack/openstack-quantum/src/test/resources/port_details.json
diff --git a/labs/openstack-swift/pom.xml b/labs/openstack/openstack-swift/pom.xml
similarity index 98%
rename from labs/openstack-swift/pom.xml
rename to labs/openstack/openstack-swift/pom.xml
index 1a411e0912..c2495e24a0 100644
--- a/labs/openstack-swift/pom.xml
+++ b/labs/openstack/openstack-swift/pom.xml
@@ -25,11 +25,11 @@
     <groupId>org.jclouds</groupId>
     <artifactId>jclouds-project</artifactId>
     <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../../project/pom.xml</relativePath>
+    <relativePath>../../../project/pom.xml</relativePath>
   </parent>
   <groupId>org.jclouds.labs</groupId>
   <artifactId>openstack-swift</artifactId>
-  <name>jcloud openstack-swift api</name>
+  <name>jclouds openstack-swift api</name>
   <description>jclouds components to access an implementation of OpenStack Swift</description>
   <packaging>bundle</packaging>
 
@@ -97,7 +97,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  
+
   <profiles>
     <profile>
       <id>live</id>
diff --git a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java b/labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java
similarity index 100%
rename from labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java
rename to labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java
diff --git a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java b/labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java
similarity index 100%
rename from labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java
rename to labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java
diff --git a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftAsyncApi.java b/labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftAsyncApi.java
similarity index 100%
rename from labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftAsyncApi.java
rename to labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftAsyncApi.java
diff --git a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftProperties.java b/labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftProperties.java
similarity index 100%
rename from labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftProperties.java
rename to labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftProperties.java
diff --git a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftRestClientModule.java b/labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftRestClientModule.java
similarity index 100%
rename from labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftRestClientModule.java
rename to labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftRestClientModule.java
diff --git a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java b/labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java
similarity index 100%
rename from labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java
rename to labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java
diff --git a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java b/labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java
similarity index 100%
rename from labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java
rename to labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java
diff --git a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java b/labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java
similarity index 100%
rename from labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java
rename to labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java
diff --git a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountAsyncApi.java b/labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountAsyncApi.java
similarity index 100%
rename from labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountAsyncApi.java
rename to labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountAsyncApi.java
diff --git a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java b/labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java
similarity index 100%
rename from labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java
rename to labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java
diff --git a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerAsyncApi.java b/labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerAsyncApi.java
similarity index 100%
rename from labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerAsyncApi.java
rename to labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerAsyncApi.java
diff --git a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java b/labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java
similarity index 100%
rename from labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java
rename to labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java
diff --git a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectAsyncApi.java b/labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectAsyncApi.java
similarity index 100%
rename from labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectAsyncApi.java
rename to labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectAsyncApi.java
diff --git a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/functions/ParseAccountMetadataResponseFromHeaders.java b/labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/functions/ParseAccountMetadataResponseFromHeaders.java
similarity index 100%
rename from labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/functions/ParseAccountMetadataResponseFromHeaders.java
rename to labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/functions/ParseAccountMetadataResponseFromHeaders.java
diff --git a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/handlers/SwiftErrorHandler.java b/labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/handlers/SwiftErrorHandler.java
similarity index 100%
rename from labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/handlers/SwiftErrorHandler.java
rename to labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/handlers/SwiftErrorHandler.java
diff --git a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/options/ListContainersOptions.java b/labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/options/ListContainersOptions.java
similarity index 100%
rename from labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/options/ListContainersOptions.java
rename to labs/openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/options/ListContainersOptions.java
diff --git a/labs/openstack-swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/labs/openstack/openstack-swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
similarity index 100%
rename from labs/openstack-swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
rename to labs/openstack/openstack-swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
diff --git a/labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/PasswordAuthenticationExpectTest.java b/labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/PasswordAuthenticationExpectTest.java
similarity index 100%
rename from labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/PasswordAuthenticationExpectTest.java
rename to labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/PasswordAuthenticationExpectTest.java
diff --git a/labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/SwiftApiMetadataTest.java b/labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/SwiftApiMetadataTest.java
similarity index 100%
rename from labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/SwiftApiMetadataTest.java
rename to labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/SwiftApiMetadataTest.java
diff --git a/labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/SwiftErrorHandlerTest.java b/labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/SwiftErrorHandlerTest.java
similarity index 100%
rename from labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/SwiftErrorHandlerTest.java
rename to labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/SwiftErrorHandlerTest.java
diff --git a/labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiExpectTest.java b/labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiExpectTest.java
similarity index 100%
rename from labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiExpectTest.java
rename to labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiExpectTest.java
diff --git a/labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java b/labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java
similarity index 100%
rename from labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java
rename to labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java
diff --git a/labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiExpectTest.java b/labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiExpectTest.java
similarity index 100%
rename from labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiExpectTest.java
rename to labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiExpectTest.java
diff --git a/labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiLiveTest.java b/labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiLiveTest.java
similarity index 100%
rename from labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiLiveTest.java
rename to labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiLiveTest.java
diff --git a/labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiExpectTest.java b/labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiExpectTest.java
similarity index 100%
rename from labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiExpectTest.java
rename to labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiExpectTest.java
diff --git a/labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiLiveTest.java b/labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiLiveTest.java
similarity index 100%
rename from labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiLiveTest.java
rename to labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiLiveTest.java
diff --git a/labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiExpectTest.java b/labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiExpectTest.java
similarity index 100%
rename from labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiExpectTest.java
rename to labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiExpectTest.java
diff --git a/labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiLiveTest.java b/labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiLiveTest.java
similarity index 100%
rename from labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiLiveTest.java
rename to labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiLiveTest.java
diff --git a/labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftAsyncApiExpectTest.java b/labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftAsyncApiExpectTest.java
similarity index 100%
rename from labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftAsyncApiExpectTest.java
rename to labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftAsyncApiExpectTest.java
diff --git a/labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftExpectTest.java b/labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftExpectTest.java
similarity index 100%
rename from labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftExpectTest.java
rename to labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftExpectTest.java
diff --git a/labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/ListContainersOptionsTest.java b/labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/ListContainersOptionsTest.java
similarity index 100%
rename from labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/ListContainersOptionsTest.java
rename to labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/ListContainersOptionsTest.java
diff --git a/labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/parse/ParseContainerListTest.java b/labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/parse/ParseContainerListTest.java
similarity index 100%
rename from labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/parse/ParseContainerListTest.java
rename to labs/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/parse/ParseContainerListTest.java
diff --git a/labs/openstack-swift/src/test/resources/container_list.json b/labs/openstack/openstack-swift/src/test/resources/container_list.json
similarity index 97%
rename from labs/openstack-swift/src/test/resources/container_list.json
rename to labs/openstack/openstack-swift/src/test/resources/container_list.json
index ef7e791530..f7d9b9bec3 100644
--- a/labs/openstack-swift/src/test/resources/container_list.json
+++ b/labs/openstack/openstack-swift/src/test/resources/container_list.json
@@ -1,4 +1,4 @@
-[
-  {"name":"test_container_1", "count":2, "bytes":78},
-  {"name":"test_container_2", "count":1, "bytes":17}
+[
+  {"name":"test_container_1", "count":2, "bytes":78},
+  {"name":"test_container_2", "count":1, "bytes":17}
 ]
\ No newline at end of file
diff --git a/labs/openstack-glance/src/test/resources/logback.xml b/labs/openstack/openstack-swift/src/test/resources/logback.xml
similarity index 96%
rename from labs/openstack-glance/src/test/resources/logback.xml
rename to labs/openstack/openstack-swift/src/test/resources/logback.xml
index bd89efb8c0..a4f81d3fa6 100644
--- a/labs/openstack-glance/src/test/resources/logback.xml
+++ b/labs/openstack/openstack-swift/src/test/resources/logback.xml
@@ -1,51 +1,51 @@
-<?xml version="1.0"?>
-<configuration scan="false">
-    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-        <file>target/test-data/jclouds.log</file>
-
-        <encoder>
-            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
-        </encoder>
-    </appender>
-
-    <appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
-        <file>target/test-data/jclouds-wire.log</file>
-
-        <encoder>
-            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
-        </encoder>
-    </appender>
-
-    <appender name="BLOBSTOREFILE" class="ch.qos.logback.core.FileAppender">
-        <file>target/test-data/jclouds-blobstore.log</file>
-
-        <encoder>
-            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
-        </encoder>
-    </appender>
-    
-    <root>
-        <level value="warn" />
-    </root>
-
-    <logger name="org.jclouds">
-        <level value="DEBUG" />
-        <appender-ref ref="FILE" />
-    </logger>
-
-    <logger name="jclouds.wire">
-        <level value="DEBUG" />
-        <appender-ref ref="WIREFILE" />
-    </logger>
-
-    <logger name="jclouds.headers">
-        <level value="DEBUG" />
-        <appender-ref ref="WIREFILE" />
-    </logger>
-
-    <logger name="jclouds.blobstore">
-        <level value="DEBUG" />
-        <appender-ref ref="BLOBSTOREFILE" />
-    </logger>
-
-</configuration>
+<?xml version="1.0"?>
+<configuration scan="false">
+    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+        <file>target/test-data/jclouds.log</file>
+
+        <encoder>
+            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
+        </encoder>
+    </appender>
+
+    <appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
+        <file>target/test-data/jclouds-wire.log</file>
+
+        <encoder>
+            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
+        </encoder>
+    </appender>
+
+    <appender name="BLOBSTOREFILE" class="ch.qos.logback.core.FileAppender">
+        <file>target/test-data/jclouds-blobstore.log</file>
+
+        <encoder>
+            <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
+        </encoder>
+    </appender>
+    
+    <root>
+        <level value="warn" />
+    </root>
+
+    <logger name="org.jclouds">
+        <level value="DEBUG" />
+        <appender-ref ref="FILE" />
+    </logger>
+
+    <logger name="jclouds.wire">
+        <level value="DEBUG" />
+        <appender-ref ref="WIREFILE" />
+    </logger>
+
+    <logger name="jclouds.headers">
+        <level value="DEBUG" />
+        <appender-ref ref="WIREFILE" />
+    </logger>
+
+    <logger name="jclouds.blobstore">
+        <level value="DEBUG" />
+        <appender-ref ref="BLOBSTOREFILE" />
+    </logger>
+
+</configuration>
diff --git a/labs/openstack/pom.xml b/labs/openstack/pom.xml
new file mode 100644
index 0000000000..f1fc3f3c78
--- /dev/null
+++ b/labs/openstack/pom.xml
@@ -0,0 +1,44 @@
+<?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>
+        <artifactId>jclouds-project</artifactId>
+        <groupId>org.jclouds</groupId>
+        <version>1.6.0-SNAPSHOT</version>
+        <relativePath>../../project/pom.xml</relativePath>
+    </parent>
+    <groupId>org.jclouds.labs</groupId>
+    <artifactId>jclouds-labs-openstack-project</artifactId>
+    <packaging>pom</packaging>
+    <name>jclouds labs openstack project</name>
+    <modules>
+       <!--<module>openstack-atlas</module>-->
+       <!--<module>openstack-cinder-v2</module>-->
+       <module>openstack-glance</module>
+       <!--<module>openstack-keystone-v3</module>-->
+       <!--<module>openstack-moniker</module>-->
+       <module>openstack-quantum</module>
+       <!--<module>openstack-reddwarf</module>-->
+       <module>openstack-swift</module>
+  </modules>
+</project>
diff --git a/labs/pom.xml b/labs/pom.xml
index f9997c932a..4f0f031b09 100644
--- a/labs/pom.xml
+++ b/labs/pom.xml
@@ -40,7 +40,6 @@
        <module>savvis-symphonyvpdc</module>
        <module>dmtf</module>
        <module>carrenza-vcloud-director</module>
-       <module>openstack-swift</module>
        <module>jenkins</module>
        <module>cdmi</module>
        <module>joyent-cloudapi</module>
@@ -63,8 +62,7 @@
        <module>abiquo</module>
        -->
        <module>oauth</module>
-       <module>openstack-quantum</module>
-       <module>openstack-glance</module>
+       <module>openstack</module>
        <module>dynect</module>
        <module>ultradns-ws</module>
   </modules>