diff --git a/README.txt b/README.txt
index f3a1cf5037..8232bbf10b 100644
--- a/README.txt
+++ b/README.txt
@@ -28,7 +28,7 @@ our dev version is 1.0-SNAPSHOT
our compute api supports: ec2, gogrid, rackspace, rimuhosting, vcloud, trmk-ecloud,
trmk-vcloudexpress, eucalyptus, bluelock-vclouddirector,
- bluelock-vcloudexpress, slicehost
+ bluelock-vcloudexpress, slicehost, stub (in-memory)
* note * the pom dependency org.jclouds/jclouds-allcompute gives you access to
to all of these providers
@@ -39,7 +39,8 @@ our blobstore api supports: s3, rackspace, azure, atmos online, att synaptic,
* note * the pom dependency org.jclouds/jclouds-allblobstore gives you access to
to all of these providers
-we also have rest clients for: chef, opscodeplatform, pcs2 (mezeo), sdn (nirvanix), twitter
+we also have rest clients for: chef, opscodeplatform, twitter, as well a number of features
+ in the sandbox
If you want access to all jclouds components, include the maven dependency org.jclouds/jclouds-all
diff --git a/all/pom.xml b/all/pom.xml
index c29afbf3ab..8235fbb327 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -39,16 +39,6 @@
jclouds-allblobstore
${project.version}
-
- ${project.groupId}
- jclouds-pcs2
- ${project.version}
-
-
- ${project.groupId}
- jclouds-sdn
- ${project.version}
-
${project.groupId}
jclouds-twitter
@@ -64,10 +54,5 @@
jclouds-opscodeplatform
${project.version}
-
- ${project.groupId}
- jclouds-boxdotnet
- ${project.version}
-
diff --git a/assemblies/src/main/resources/assemblies/package-descriptor.xml b/assemblies/src/main/resources/assemblies/package-descriptor.xml
index 9afba8c97c..301cb16a0e 100644
--- a/assemblies/src/main/resources/assemblies/package-descriptor.xml
+++ b/assemblies/src/main/resources/assemblies/package-descriptor.xml
@@ -243,59 +243,32 @@
providers/azure
-
+
- mezeo/pcs2/target
+ slicehost/target
- jclouds-pcs2-${project.version}.jar
+ jclouds-slicehost-${project.version}.jar
- providers/mezeo/lib
+ providers/slicehost/lib
- mezeo/pcs2/target
+ slicehost/target
- jclouds-pcs2-${project.version}-sources.jar
+ jclouds-slicehost-${project.version}-sources.jar
- providers/mezeo/src
+ providers/slicehost/src
- mezeo/pcs2/target/apidocs
- providers/mezeo/docs
+ slicehost/target/apidocs
+ providers/slicehost/docs
- mezeo/pcs2
+ slicehost
README.txt
- providers/mezeo
-
-
-
-
- nirvanix/sdn/target
-
- jclouds-sdn-${project.version}.jar
-
- providers/nirvanix/lib
-
-
- nirvanix/sdn/target
-
- jclouds-sdn-${project.version}-sources.jar
-
- providers/nirvanix/src
-
-
- nirvanix/sdn/target/apidocs
- providers/nirvanix/docs
-
-
- nirvanix/sdn
-
- README.txt
-
- providers/nirvanix
-
+ providers/slicehost
+
@@ -324,6 +297,33 @@
providers/rackspace
+
+
+ gogrid/target
+
+ jclouds-gogrid-${project.version}.jar
+
+ providers/gogrid/lib
+
+
+ gogrid/target
+
+ jclouds-gogrid-${project.version}-sources.jar
+
+ providers/gogrid/src
+
+
+ gogrid/target/apidocs
+ providers/gogrid/docs
+
+
+ gogrid
+
+ README.txt
+
+ providers/gogrid
+
+
rimuhosting/target
@@ -351,7 +351,62 @@
providers/rimuhosting
+
+
+ vcloud/core/target
+
+ jclouds-vcloud-${project.version}.jar
+
+ providers/bluelock/lib
+
+
+ vcloud/core/target
+
+ jclouds-vcloud-${project.version}-sources.jar
+
+ providers/bluelock/src
+
+
+ vcloud/bluelock/target
+
+ jclouds-bluelock-${project.version}.jar
+
+ providers/bluelock/lib
+
+
+ vcloud/bluelock/target
+
+ jclouds-bluelock-${project.version}-sources.jar
+
+ providers/bluelock/src
+
+
+ vcloud/bluelock/target/apidocs
+ providers/bluelock/docs
+
+
+ vcloud/bluelock
+
+ README.txt
+
+ providers/bluelock
+
+
+
+ vcloud/core/target
+
+ jclouds-vcloud-${project.version}.jar
+
+ providers/terremark/lib
+
+
+ vcloud/core/target
+
+ jclouds-vcloud-${project.version}-sources.jar
+
+ providers/terremark/src
+
vcloud/terremark/target
@@ -378,6 +433,74 @@
providers/terremark
+
+
+ chef/target
+
+ jclouds-chef-${project.version}.jar
+
+ providers/chef/lib
+
+
+ chef/target
+
+ jclouds-chef-${project.version}-sources.jar
+
+ providers/chef/src
+
+
+ chef/target/apidocs
+ providers/chef/docs
+
+
+ chef
+
+ README.txt
+
+ providers/chef
+
+
+
+
+ chef/target
+
+ jclouds-chef-${project.version}.jar
+
+ providers/opscodeplatform/lib
+
+
+ chef/target
+
+ jclouds-chef-${project.version}-sources.jar
+
+ providers/opscodeplatform/src
+
+
+ opscodeplatform/target
+
+ jclouds-opscodeplatform-${project.version}.jar
+
+ providers/opscodeplatform/lib
+
+
+ opscodeplatform/target
+
+ jclouds-opscodeplatform-${project.version}-sources.jar
+
+ providers/opscodeplatform/src
+
+
+ opscodeplatform/target/apidocs
+ providers/opscodeplatform/docs
+
+
+ opscodeplatform
+
+ README.txt
+
+ providers/opscodeplatform
+
+
twitter/target
diff --git a/aws/extensions/pom.xml b/aws/extensions/pom.xml
deleted file mode 100644
index e401ade46f..0000000000
--- a/aws/extensions/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
- 4.0.0
-
- jclouds-aws-project
- org.jclouds
- 1.0-SNAPSHOT
-
- jclouds-aws-extensions-project
- pom
- jclouds AWS extensions aggregator
-
- jets3t
-
-
-
-
- ${project.groupId}
- jclouds-aws
- ${project.version}
-
-
- ${project.groupId}
- jclouds-blobstore
- ${project.version}
- test-jar
- test
-
-
- ${project.groupId}
- jclouds-aws
- ${project.version}
- test-jar
- test
-
-
-
diff --git a/aws/pom.xml b/aws/pom.xml
index 6750534dbf..83215e64e2 100644
--- a/aws/pom.xml
+++ b/aws/pom.xml
@@ -33,7 +33,6 @@
jclouds AWS project
core
- extensions
demos
diff --git a/pom.xml b/pom.xml
index d321f80014..e6289553a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,8 +44,6 @@
aws
azure
atmos
- mezeo
- nirvanix
rackspace
rimuhosting
twitter
@@ -53,7 +51,6 @@
gogrid
chef
opscodeplatform
- boxdotnet
slicehost
allcompute
allblobstore
diff --git a/boxdotnet/pom.xml b/sandbox/boxdotnet/pom.xml
similarity index 100%
rename from boxdotnet/pom.xml
rename to sandbox/boxdotnet/pom.xml
diff --git a/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetAsyncClient.java b/sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetAsyncClient.java
similarity index 100%
rename from boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetAsyncClient.java
rename to sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetAsyncClient.java
diff --git a/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetClient.java b/sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetClient.java
similarity index 100%
rename from boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetClient.java
rename to sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetClient.java
diff --git a/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetContextBuilder.java b/sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetContextBuilder.java
similarity index 100%
rename from boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetContextBuilder.java
rename to sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetContextBuilder.java
diff --git a/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetPropertiesBuilder.java b/sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetPropertiesBuilder.java
similarity index 100%
rename from boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetPropertiesBuilder.java
rename to sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetPropertiesBuilder.java
diff --git a/boxdotnet/src/main/java/org/jclouds/boxdotnet/config/BoxDotNetRestClientModule.java b/sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/config/BoxDotNetRestClientModule.java
similarity index 100%
rename from boxdotnet/src/main/java/org/jclouds/boxdotnet/config/BoxDotNetRestClientModule.java
rename to sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/config/BoxDotNetRestClientModule.java
diff --git a/boxdotnet/src/main/java/org/jclouds/boxdotnet/handlers/BoxDotNetErrorHandler.java b/sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/handlers/BoxDotNetErrorHandler.java
similarity index 100%
rename from boxdotnet/src/main/java/org/jclouds/boxdotnet/handlers/BoxDotNetErrorHandler.java
rename to sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/handlers/BoxDotNetErrorHandler.java
diff --git a/boxdotnet/src/test/java/org/jclouds/boxdotnet/BoxDotNetAsyncClientTest.java b/sandbox/boxdotnet/src/test/java/org/jclouds/boxdotnet/BoxDotNetAsyncClientTest.java
similarity index 100%
rename from boxdotnet/src/test/java/org/jclouds/boxdotnet/BoxDotNetAsyncClientTest.java
rename to sandbox/boxdotnet/src/test/java/org/jclouds/boxdotnet/BoxDotNetAsyncClientTest.java
diff --git a/boxdotnet/src/test/java/org/jclouds/boxdotnet/BoxDotNetClientLiveTest.java b/sandbox/boxdotnet/src/test/java/org/jclouds/boxdotnet/BoxDotNetClientLiveTest.java
similarity index 100%
rename from boxdotnet/src/test/java/org/jclouds/boxdotnet/BoxDotNetClientLiveTest.java
rename to sandbox/boxdotnet/src/test/java/org/jclouds/boxdotnet/BoxDotNetClientLiveTest.java
diff --git a/boxdotnet/src/test/resources/log4j.xml b/sandbox/boxdotnet/src/test/resources/log4j.xml
similarity index 100%
rename from boxdotnet/src/test/resources/log4j.xml
rename to sandbox/boxdotnet/src/test/resources/log4j.xml
diff --git a/aws/extensions/jets3t/README.txt b/sandbox/jets3t/README.txt
similarity index 100%
rename from aws/extensions/jets3t/README.txt
rename to sandbox/jets3t/README.txt
diff --git a/aws/extensions/jets3t/pom.xml b/sandbox/jets3t/pom.xml
similarity index 100%
rename from aws/extensions/jets3t/pom.xml
rename to sandbox/jets3t/pom.xml
diff --git a/aws/extensions/jets3t/src/main/java/org/jclouds/aws/s3/jets3t/JCloudsS3Service.java b/sandbox/jets3t/src/main/java/org/jclouds/aws/s3/jets3t/JCloudsS3Service.java
similarity index 100%
rename from aws/extensions/jets3t/src/main/java/org/jclouds/aws/s3/jets3t/JCloudsS3Service.java
rename to sandbox/jets3t/src/main/java/org/jclouds/aws/s3/jets3t/JCloudsS3Service.java
diff --git a/aws/extensions/jets3t/src/main/java/org/jclouds/aws/s3/jets3t/Util.java b/sandbox/jets3t/src/main/java/org/jclouds/aws/s3/jets3t/Util.java
similarity index 100%
rename from aws/extensions/jets3t/src/main/java/org/jclouds/aws/s3/jets3t/Util.java
rename to sandbox/jets3t/src/main/java/org/jclouds/aws/s3/jets3t/Util.java
diff --git a/aws/extensions/jets3t/src/test/java/org/jclouds/aws/s3/jets3t/JCloudsS3ServiceLiveTest.java b/sandbox/jets3t/src/test/java/org/jclouds/aws/s3/jets3t/JCloudsS3ServiceLiveTest.java
similarity index 100%
rename from aws/extensions/jets3t/src/test/java/org/jclouds/aws/s3/jets3t/JCloudsS3ServiceLiveTest.java
rename to sandbox/jets3t/src/test/java/org/jclouds/aws/s3/jets3t/JCloudsS3ServiceLiveTest.java
diff --git a/mezeo/pcs2/core/.gitignore b/sandbox/mezeo/pcs2/core/.gitignore
similarity index 100%
rename from mezeo/pcs2/core/.gitignore
rename to sandbox/mezeo/pcs2/core/.gitignore
diff --git a/mezeo/pcs2/core/README.txt b/sandbox/mezeo/pcs2/core/README.txt
similarity index 100%
rename from mezeo/pcs2/core/README.txt
rename to sandbox/mezeo/pcs2/core/README.txt
diff --git a/mezeo/pcs2/core/pom.xml b/sandbox/mezeo/pcs2/core/pom.xml
similarity index 100%
rename from mezeo/pcs2/core/pom.xml
rename to sandbox/mezeo/pcs2/core/pom.xml
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/PCSAsyncClient.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/PCSAsyncClient.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/PCSAsyncClient.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/PCSAsyncClient.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/PCSClient.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/PCSClient.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/PCSClient.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/PCSClient.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/PCSCloudAsyncClient.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/PCSCloudAsyncClient.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/PCSCloudAsyncClient.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/PCSCloudAsyncClient.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/PCSContextBuilder.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/PCSContextBuilder.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/PCSContextBuilder.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/PCSContextBuilder.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayload.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayload.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayload.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayload.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayload.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayload.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayload.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayload.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/binders/BindPCSFileToMultipartForm.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/binders/BindPCSFileToMultipartForm.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/binders/BindPCSFileToMultipartForm.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/binders/BindPCSFileToMultipartForm.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToFileInfo.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToFileInfo.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToFileInfo.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToFileInfo.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToPCSFile.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToPCSFile.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToPCSFile.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToPCSFile.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/FileInfoToBlobMetadata.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/FileInfoToBlobMetadata.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/FileInfoToBlobMetadata.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/FileInfoToBlobMetadata.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/PCSFileToBlob.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/PCSFileToBlob.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/PCSFileToBlob.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/PCSFileToBlob.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/config/PCSObjectModule.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/config/PCSObjectModule.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/config/PCSObjectModule.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/config/PCSObjectModule.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/config/PCSRestClientModule.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/config/PCSRestClientModule.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/config/PCSRestClientModule.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/config/PCSRestClientModule.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerInfo.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerInfo.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerInfo.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerInfo.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerList.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerList.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerList.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerList.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfo.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfo.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfo.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfo.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfoWithMetadata.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfoWithMetadata.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfoWithMetadata.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfoWithMetadata.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableFileInfo.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableFileInfo.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableFileInfo.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableFileInfo.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableResourceInfo.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableResourceInfo.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableResourceInfo.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableResourceInfo.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/PCSFile.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/PCSFile.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/PCSFile.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/PCSFile.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/ResourceInfo.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/ResourceInfo.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/ResourceInfo.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/ResourceInfo.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerInfoImpl.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerInfoImpl.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerInfoImpl.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerInfoImpl.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerListImpl.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerListImpl.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerListImpl.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerListImpl.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoImpl.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoImpl.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoImpl.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoImpl.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoWithMetadataImpl.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoWithMetadataImpl.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoWithMetadataImpl.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoWithMetadataImpl.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableFileInfoImpl.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableFileInfoImpl.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableFileInfoImpl.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableFileInfoImpl.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableResourceInfoImpl.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableResourceInfoImpl.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableResourceInfoImpl.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableResourceInfoImpl.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/PCSFileImpl.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/PCSFileImpl.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/PCSFileImpl.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/PCSFileImpl.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ResourceInfoImpl.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ResourceInfoImpl.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ResourceInfoImpl.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ResourceInfoImpl.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Contacts.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Contacts.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Contacts.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Contacts.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Metacontainers.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Metacontainers.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Metacontainers.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Metacontainers.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Projects.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Projects.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Projects.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Projects.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Recyclebin.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Recyclebin.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Recyclebin.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Recyclebin.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/RootContainer.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/RootContainer.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/RootContainer.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/RootContainer.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Shares.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Shares.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Shares.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Shares.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Tags.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Tags.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Tags.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Tags.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/WebDAV.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/WebDAV.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/WebDAV.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/endpoints/WebDAV.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/functions/AddMetadataItemIntoMap.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/functions/AddMetadataItemIntoMap.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/functions/AddMetadataItemIntoMap.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/functions/AddMetadataItemIntoMap.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnFalseIfContainerNotFound.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnFalseIfContainerNotFound.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnFalseIfContainerNotFound.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnFalseIfContainerNotFound.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnTrueIfContainerAlreadyExists.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnTrueIfContainerAlreadyExists.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnTrueIfContainerAlreadyExists.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnTrueIfContainerAlreadyExists.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/handlers/PCSClientErrorRetryHandler.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/handlers/PCSClientErrorRetryHandler.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/handlers/PCSClientErrorRetryHandler.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/handlers/PCSClientErrorRetryHandler.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/options/PutBlockOptions.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/options/PutBlockOptions.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/options/PutBlockOptions.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/options/PutBlockOptions.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHandler.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHandler.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHandler.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHandler.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/xml/ContainerHandler.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/xml/ContainerHandler.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/xml/ContainerHandler.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/xml/ContainerHandler.java
diff --git a/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/xml/FileHandler.java b/sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/xml/FileHandler.java
similarity index 100%
rename from mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/xml/FileHandler.java
rename to sandbox/mezeo/pcs2/core/src/main/java/org/jclouds/mezeo/pcs2/xml/FileHandler.java
diff --git a/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/PCSAsyncClientTest.java b/sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/PCSAsyncClientTest.java
similarity index 100%
rename from mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/PCSAsyncClientTest.java
rename to sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/PCSAsyncClientTest.java
diff --git a/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/PCSClientLiveTest.java b/sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/PCSClientLiveTest.java
similarity index 100%
rename from mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/PCSClientLiveTest.java
rename to sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/PCSClientLiveTest.java
diff --git a/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/PCSCloudTest.java b/sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/PCSCloudTest.java
similarity index 100%
rename from mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/PCSCloudTest.java
rename to sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/PCSCloudTest.java
diff --git a/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/ProvidersInPropertiesTest.java b/sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/ProvidersInPropertiesTest.java
similarity index 100%
rename from mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/ProvidersInPropertiesTest.java
rename to sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/ProvidersInPropertiesTest.java
diff --git a/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayloadTest.java b/sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayloadTest.java
similarity index 100%
rename from mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayloadTest.java
rename to sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayloadTest.java
diff --git a/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayloadTest.java b/sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayloadTest.java
similarity index 100%
rename from mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayloadTest.java
rename to sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayloadTest.java
diff --git a/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/functions/AddMetadataAndReturnIdTest.java b/sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/functions/AddMetadataAndReturnIdTest.java
similarity index 100%
rename from mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/functions/AddMetadataAndReturnIdTest.java
rename to sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/functions/AddMetadataAndReturnIdTest.java
diff --git a/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/functions/AssembleBlobFromBlobMetadataCallTest.java b/sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/functions/AssembleBlobFromBlobMetadataCallTest.java
similarity index 100%
rename from mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/functions/AssembleBlobFromBlobMetadataCallTest.java
rename to sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/functions/AssembleBlobFromBlobMetadataCallTest.java
diff --git a/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/internal/StubPCSAsyncClient.java b/sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/internal/StubPCSAsyncClient.java
similarity index 100%
rename from mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/internal/StubPCSAsyncClient.java
rename to sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/internal/StubPCSAsyncClient.java
diff --git a/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/options/PutBlockOptionsTest.java b/sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/options/PutBlockOptionsTest.java
similarity index 100%
rename from mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/options/PutBlockOptionsTest.java
rename to sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/options/PutBlockOptionsTest.java
diff --git a/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHanderTest.java b/sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHanderTest.java
similarity index 100%
rename from mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHanderTest.java
rename to sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHanderTest.java
diff --git a/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/xml/ContainerHandlerTest.java b/sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/xml/ContainerHandlerTest.java
similarity index 100%
rename from mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/xml/ContainerHandlerTest.java
rename to sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/xml/ContainerHandlerTest.java
diff --git a/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/xml/FileMetadataHandlerTest.java b/sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/xml/FileMetadataHandlerTest.java
similarity index 100%
rename from mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/xml/FileMetadataHandlerTest.java
rename to sandbox/mezeo/pcs2/core/src/test/java/org/jclouds/mezeo/pcs2/xml/FileMetadataHandlerTest.java
diff --git a/mezeo/pcs2/core/src/test/resources/discovery.xml b/sandbox/mezeo/pcs2/core/src/test/resources/discovery.xml
similarity index 100%
rename from mezeo/pcs2/core/src/test/resources/discovery.xml
rename to sandbox/mezeo/pcs2/core/src/test/resources/discovery.xml
diff --git a/mezeo/pcs2/core/src/test/resources/log4j.xml b/sandbox/mezeo/pcs2/core/src/test/resources/log4j.xml
similarity index 100%
rename from mezeo/pcs2/core/src/test/resources/log4j.xml
rename to sandbox/mezeo/pcs2/core/src/test/resources/log4j.xml
diff --git a/mezeo/pcs2/core/src/test/resources/test_file_metadata.xml b/sandbox/mezeo/pcs2/core/src/test/resources/test_file_metadata.xml
similarity index 100%
rename from mezeo/pcs2/core/src/test/resources/test_file_metadata.xml
rename to sandbox/mezeo/pcs2/core/src/test/resources/test_file_metadata.xml
diff --git a/mezeo/pcs2/core/src/test/resources/test_root_container.xml b/sandbox/mezeo/pcs2/core/src/test/resources/test_root_container.xml
similarity index 100%
rename from mezeo/pcs2/core/src/test/resources/test_root_container.xml
rename to sandbox/mezeo/pcs2/core/src/test/resources/test_root_container.xml
diff --git a/mezeo/pcs2/pom.xml b/sandbox/mezeo/pcs2/pom.xml
similarity index 100%
rename from mezeo/pcs2/pom.xml
rename to sandbox/mezeo/pcs2/pom.xml
diff --git a/mezeo/pom.xml b/sandbox/mezeo/pom.xml
similarity index 100%
rename from mezeo/pom.xml
rename to sandbox/mezeo/pom.xml
diff --git a/nirvanix/pom.xml b/sandbox/nirvanix/pom.xml
similarity index 100%
rename from nirvanix/pom.xml
rename to sandbox/nirvanix/pom.xml
diff --git a/nirvanix/sdn/core/.gitignore b/sandbox/nirvanix/sdn/core/.gitignore
similarity index 100%
rename from nirvanix/sdn/core/.gitignore
rename to sandbox/nirvanix/sdn/core/.gitignore
diff --git a/nirvanix/sdn/core/README.txt b/sandbox/nirvanix/sdn/core/README.txt
similarity index 100%
rename from nirvanix/sdn/core/README.txt
rename to sandbox/nirvanix/sdn/core/README.txt
diff --git a/nirvanix/sdn/core/pom.xml b/sandbox/nirvanix/sdn/core/pom.xml
similarity index 100%
rename from nirvanix/sdn/core/pom.xml
rename to sandbox/nirvanix/sdn/core/pom.xml
diff --git a/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SDNAsyncClient.java b/sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SDNAsyncClient.java
similarity index 100%
rename from nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SDNAsyncClient.java
rename to sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SDNAsyncClient.java
diff --git a/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SDNAuthAsyncClient.java b/sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SDNAuthAsyncClient.java
similarity index 100%
rename from nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SDNAuthAsyncClient.java
rename to sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SDNAuthAsyncClient.java
diff --git a/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SDNClient.java b/sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SDNClient.java
similarity index 100%
rename from nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SDNClient.java
rename to sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SDNClient.java
diff --git a/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SDNContextBuilder.java b/sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SDNContextBuilder.java
similarity index 100%
rename from nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SDNContextBuilder.java
rename to sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SDNContextBuilder.java
diff --git a/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SDNPropertiesBuilder.java b/sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SDNPropertiesBuilder.java
similarity index 100%
rename from nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SDNPropertiesBuilder.java
rename to sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SDNPropertiesBuilder.java
diff --git a/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SessionToken.java b/sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SessionToken.java
similarity index 100%
rename from nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SessionToken.java
rename to sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/SessionToken.java
diff --git a/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/binders/BindMetadataToQueryParams.java b/sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/binders/BindMetadataToQueryParams.java
similarity index 100%
rename from nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/binders/BindMetadataToQueryParams.java
rename to sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/binders/BindMetadataToQueryParams.java
diff --git a/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/config/SDNAuthRestClientModule.java b/sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/config/SDNAuthRestClientModule.java
similarity index 100%
rename from nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/config/SDNAuthRestClientModule.java
rename to sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/config/SDNAuthRestClientModule.java
diff --git a/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/config/SDNRestClientModule.java b/sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/config/SDNRestClientModule.java
similarity index 100%
rename from nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/config/SDNRestClientModule.java
rename to sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/config/SDNRestClientModule.java
diff --git a/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/domain/UploadInfo.java b/sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/domain/UploadInfo.java
similarity index 100%
rename from nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/domain/UploadInfo.java
rename to sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/domain/UploadInfo.java
diff --git a/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/filters/AddSessionTokenToRequest.java b/sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/filters/AddSessionTokenToRequest.java
similarity index 100%
rename from nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/filters/AddSessionTokenToRequest.java
rename to sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/filters/AddSessionTokenToRequest.java
diff --git a/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/filters/InsertUserContextIntoPath.java b/sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/filters/InsertUserContextIntoPath.java
similarity index 100%
rename from nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/filters/InsertUserContextIntoPath.java
rename to sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/filters/InsertUserContextIntoPath.java
diff --git a/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseMetadataFromJsonResponse.java b/sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseMetadataFromJsonResponse.java
similarity index 100%
rename from nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseMetadataFromJsonResponse.java
rename to sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseMetadataFromJsonResponse.java
diff --git a/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseSessionTokenFromJsonResponse.java b/sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseSessionTokenFromJsonResponse.java
similarity index 100%
rename from nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseSessionTokenFromJsonResponse.java
rename to sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseSessionTokenFromJsonResponse.java
diff --git a/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseUploadInfoFromJsonResponse.java b/sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseUploadInfoFromJsonResponse.java
similarity index 100%
rename from nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseUploadInfoFromJsonResponse.java
rename to sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseUploadInfoFromJsonResponse.java
diff --git a/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/reference/SDNConstants.java b/sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/reference/SDNConstants.java
similarity index 100%
rename from nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/reference/SDNConstants.java
rename to sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/reference/SDNConstants.java
diff --git a/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/reference/SDNQueryParams.java b/sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/reference/SDNQueryParams.java
similarity index 100%
rename from nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/reference/SDNQueryParams.java
rename to sandbox/nirvanix/sdn/core/src/main/java/org/jclouds/nirvanix/sdn/reference/SDNQueryParams.java
diff --git a/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/ProvidersInPropertiesTest.java b/sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/ProvidersInPropertiesTest.java
similarity index 100%
rename from nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/ProvidersInPropertiesTest.java
rename to sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/ProvidersInPropertiesTest.java
diff --git a/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNAsyncClientTest.java b/sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNAsyncClientTest.java
similarity index 100%
rename from nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNAsyncClientTest.java
rename to sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNAsyncClientTest.java
diff --git a/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNAuthAsyncClientTest.java b/sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNAuthAsyncClientTest.java
similarity index 100%
rename from nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNAuthAsyncClientTest.java
rename to sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNAuthAsyncClientTest.java
diff --git a/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNAuthenticationLiveTest.java b/sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNAuthenticationLiveTest.java
similarity index 100%
rename from nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNAuthenticationLiveTest.java
rename to sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNAuthenticationLiveTest.java
diff --git a/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNClientLiveTest.java b/sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNClientLiveTest.java
similarity index 100%
rename from nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNClientLiveTest.java
rename to sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/SDNClientLiveTest.java
diff --git a/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/binders/BindMetadataToQueryParamsTest.java b/sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/binders/BindMetadataToQueryParamsTest.java
similarity index 100%
rename from nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/binders/BindMetadataToQueryParamsTest.java
rename to sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/binders/BindMetadataToQueryParamsTest.java
diff --git a/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/filters/AddSessionTokenToRequestTest.java b/sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/filters/AddSessionTokenToRequestTest.java
similarity index 100%
rename from nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/filters/AddSessionTokenToRequestTest.java
rename to sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/filters/AddSessionTokenToRequestTest.java
diff --git a/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/filters/InsertUserContextIntoPathTest.java b/sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/filters/InsertUserContextIntoPathTest.java
similarity index 100%
rename from nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/filters/InsertUserContextIntoPathTest.java
rename to sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/filters/InsertUserContextIntoPathTest.java
diff --git a/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseMetadataFromJsonResponseTest.java b/sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseMetadataFromJsonResponseTest.java
similarity index 100%
rename from nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseMetadataFromJsonResponseTest.java
rename to sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseMetadataFromJsonResponseTest.java
diff --git a/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseSessionTokenFromJsonResponseTest.java b/sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseSessionTokenFromJsonResponseTest.java
similarity index 100%
rename from nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseSessionTokenFromJsonResponseTest.java
rename to sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseSessionTokenFromJsonResponseTest.java
diff --git a/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseUploadInfoFromJsonResponseTest.java b/sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseUploadInfoFromJsonResponseTest.java
similarity index 100%
rename from nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseUploadInfoFromJsonResponseTest.java
rename to sandbox/nirvanix/sdn/core/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseUploadInfoFromJsonResponseTest.java
diff --git a/nirvanix/sdn/core/src/test/resources/authtoken.json b/sandbox/nirvanix/sdn/core/src/test/resources/authtoken.json
similarity index 100%
rename from nirvanix/sdn/core/src/test/resources/authtoken.json
rename to sandbox/nirvanix/sdn/core/src/test/resources/authtoken.json
diff --git a/nirvanix/sdn/core/src/test/resources/log4j.xml b/sandbox/nirvanix/sdn/core/src/test/resources/log4j.xml
similarity index 100%
rename from nirvanix/sdn/core/src/test/resources/log4j.xml
rename to sandbox/nirvanix/sdn/core/src/test/resources/log4j.xml
diff --git a/nirvanix/sdn/core/src/test/resources/login.json b/sandbox/nirvanix/sdn/core/src/test/resources/login.json
similarity index 100%
rename from nirvanix/sdn/core/src/test/resources/login.json
rename to sandbox/nirvanix/sdn/core/src/test/resources/login.json
diff --git a/nirvanix/sdn/core/src/test/resources/metadata.json b/sandbox/nirvanix/sdn/core/src/test/resources/metadata.json
similarity index 100%
rename from nirvanix/sdn/core/src/test/resources/metadata.json
rename to sandbox/nirvanix/sdn/core/src/test/resources/metadata.json
diff --git a/nirvanix/sdn/pom.xml b/sandbox/nirvanix/sdn/pom.xml
similarity index 100%
rename from nirvanix/sdn/pom.xml
rename to sandbox/nirvanix/sdn/pom.xml