diff --git a/sandbox/cloudwatch/pom.xml b/sandbox-apis/sandbox/cloudwatch/pom.xml
similarity index 100%
rename from sandbox/cloudwatch/pom.xml
rename to sandbox-apis/sandbox/cloudwatch/pom.xml
diff --git a/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchAsyncClient.java b/sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchAsyncClient.java
similarity index 100%
rename from sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchAsyncClient.java
rename to sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchAsyncClient.java
diff --git a/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchClient.java b/sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchClient.java
similarity index 100%
rename from sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchClient.java
rename to sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchClient.java
diff --git a/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchContextBuilder.java b/sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchContextBuilder.java
similarity index 100%
rename from sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchContextBuilder.java
rename to sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchContextBuilder.java
diff --git a/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchPropertiesBuilder.java b/sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchPropertiesBuilder.java
similarity index 100%
rename from sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchPropertiesBuilder.java
rename to sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchPropertiesBuilder.java
diff --git a/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/config/CloudWatchRestClientModule.java b/sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/config/CloudWatchRestClientModule.java
similarity index 100%
rename from sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/config/CloudWatchRestClientModule.java
rename to sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/config/CloudWatchRestClientModule.java
diff --git a/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java b/sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java
similarity index 100%
rename from sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java
rename to sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java
diff --git a/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/StandardUnit.java b/sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/StandardUnit.java
similarity index 100%
rename from sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/StandardUnit.java
rename to sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/StandardUnit.java
diff --git a/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/functions/ISO8601Format.java b/sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/functions/ISO8601Format.java
similarity index 100%
rename from sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/functions/ISO8601Format.java
rename to sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/functions/ISO8601Format.java
diff --git a/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/DatapointHandler.java b/sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/DatapointHandler.java
similarity index 100%
rename from sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/DatapointHandler.java
rename to sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/DatapointHandler.java
diff --git a/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandler.java b/sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandler.java
similarity index 100%
rename from sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandler.java
rename to sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandler.java
diff --git a/sandbox/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchAsyncClientTest.java b/sandbox-apis/sandbox/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchAsyncClientTest.java
similarity index 100%
rename from sandbox/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchAsyncClientTest.java
rename to sandbox-apis/sandbox/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchAsyncClientTest.java
diff --git a/sandbox/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchClientLiveTest.java b/sandbox-apis/sandbox/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchClientLiveTest.java
similarity index 100%
rename from sandbox/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchClientLiveTest.java
rename to sandbox-apis/sandbox/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchClientLiveTest.java
diff --git a/sandbox/cloudwatch/src/test/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandlerTest.java b/sandbox-apis/sandbox/cloudwatch/src/test/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandlerTest.java
similarity index 100%
rename from sandbox/cloudwatch/src/test/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandlerTest.java
rename to sandbox-apis/sandbox/cloudwatch/src/test/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandlerTest.java
diff --git a/sandbox/cloudwatch/src/test/resources/get_metric_statistics.xml b/sandbox-apis/sandbox/cloudwatch/src/test/resources/get_metric_statistics.xml
similarity index 100%
rename from sandbox/cloudwatch/src/test/resources/get_metric_statistics.xml
rename to sandbox-apis/sandbox/cloudwatch/src/test/resources/get_metric_statistics.xml
diff --git a/sandbox/cloudwatch/src/test/resources/log4j.xml b/sandbox-apis/sandbox/cloudwatch/src/test/resources/log4j.xml
similarity index 100%
rename from sandbox/cloudwatch/src/test/resources/log4j.xml
rename to sandbox-apis/sandbox/cloudwatch/src/test/resources/log4j.xml
diff --git a/sandbox/deltacloud/README.txt b/sandbox-apis/sandbox/deltacloud/README.txt
similarity index 100%
rename from sandbox/deltacloud/README.txt
rename to sandbox-apis/sandbox/deltacloud/README.txt
diff --git a/sandbox/deltacloud/pom.xml b/sandbox-apis/sandbox/deltacloud/pom.xml
similarity index 100%
rename from sandbox/deltacloud/pom.xml
rename to sandbox-apis/sandbox/deltacloud/pom.xml
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudAsyncClient.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudAsyncClient.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudAsyncClient.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudAsyncClient.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudClient.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudClient.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudClient.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudClient.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudContextBuilder.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudContextBuilder.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudContextBuilder.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudContextBuilder.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudPropertiesBuilder.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudPropertiesBuilder.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudPropertiesBuilder.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudPropertiesBuilder.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/HardwareProfiles.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/HardwareProfiles.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/HardwareProfiles.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/HardwareProfiles.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Images.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Images.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Images.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Images.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/InstanceStates.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/InstanceStates.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/InstanceStates.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/InstanceStates.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Instances.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Instances.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Instances.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Instances.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Realms.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Realms.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Realms.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Realms.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/config/DeltacloudRestClientModule.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/config/DeltacloudRestClientModule.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/config/DeltacloudRestClientModule.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/config/DeltacloudRestClientModule.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Architecture.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Architecture.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Architecture.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Architecture.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/DeltacloudCollection.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/DeltacloudCollection.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/DeltacloudCollection.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/DeltacloudCollection.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/EnumHardwareProperty.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/EnumHardwareProperty.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/EnumHardwareProperty.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/EnumHardwareProperty.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Feature.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Feature.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Feature.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Feature.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/FixedHardwareProperty.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/FixedHardwareProperty.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/FixedHardwareProperty.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/FixedHardwareProperty.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareParameter.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareParameter.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareParameter.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareParameter.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProfile.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProfile.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProfile.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProfile.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProperty.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProperty.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProperty.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProperty.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Image.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Image.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Image.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Image.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Instance.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Instance.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Instance.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Instance.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/InstanceAction.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/InstanceAction.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/InstanceAction.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/InstanceAction.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/InstanceState.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/InstanceState.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/InstanceState.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/InstanceState.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/ParameterizedHardwareProperty.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/ParameterizedHardwareProperty.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/ParameterizedHardwareProperty.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/ParameterizedHardwareProperty.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RangeHardwareProperty.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RangeHardwareProperty.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RangeHardwareProperty.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RangeHardwareProperty.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Realm.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Realm.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Realm.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Realm.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RealmState.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RealmState.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RealmState.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RealmState.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Transition.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Transition.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Transition.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Transition.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionAutomatically.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionAutomatically.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionAutomatically.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionAutomatically.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionOnAction.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionOnAction.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionOnAction.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionOnAction.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/internal/BaseHardwareProperty.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/internal/BaseHardwareProperty.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/internal/BaseHardwareProperty.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/internal/BaseHardwareProperty.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/functions/ReturnVoidOnRedirectedDelete.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/functions/ReturnVoidOnRedirectedDelete.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/functions/ReturnVoidOnRedirectedDelete.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/functions/ReturnVoidOnRedirectedDelete.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandler.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandler.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandler.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandler.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandler.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandler.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandler.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandler.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/options/CreateInstanceOptions.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/options/CreateInstanceOptions.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/options/CreateInstanceOptions.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/options/CreateInstanceOptions.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionHandler.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionHandler.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionHandler.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionHandler.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandler.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandler.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandler.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandler.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfileHandler.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfileHandler.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfileHandler.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfileHandler.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfilesHandler.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfilesHandler.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfilesHandler.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfilesHandler.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwarePropertyHandler.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwarePropertyHandler.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwarePropertyHandler.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwarePropertyHandler.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImageHandler.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImageHandler.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImageHandler.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImageHandler.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImagesHandler.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImagesHandler.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImagesHandler.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImagesHandler.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceHandler.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceHandler.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceHandler.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceHandler.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceStatesHandler.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceStatesHandler.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceStatesHandler.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceStatesHandler.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstancesHandler.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstancesHandler.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstancesHandler.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstancesHandler.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmHandler.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmHandler.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmHandler.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmHandler.java
diff --git a/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmsHandler.java b/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmsHandler.java
similarity index 100%
rename from sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmsHandler.java
rename to sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmsHandler.java
diff --git a/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudAsyncClientTest.java b/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudAsyncClientTest.java
similarity index 100%
rename from sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudAsyncClientTest.java
rename to sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudAsyncClientTest.java
diff --git a/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudClientLiveTest.java b/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudClientLiveTest.java
similarity index 100%
rename from sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudClientLiveTest.java
rename to sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudClientLiveTest.java
diff --git a/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java b/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java
similarity index 100%
rename from sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java
rename to sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java
diff --git a/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandlerTest.java b/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandlerTest.java
similarity index 100%
rename from sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandlerTest.java
rename to sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandlerTest.java
diff --git a/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandlerTest.java b/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandlerTest.java
similarity index 100%
rename from sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandlerTest.java
rename to sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandlerTest.java
diff --git a/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/options/CreateInstanceOptionsTest.java b/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/options/CreateInstanceOptionsTest.java
similarity index 100%
rename from sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/options/CreateInstanceOptionsTest.java
rename to sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/options/CreateInstanceOptionsTest.java
diff --git a/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandlerTest.java b/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandlerTest.java
similarity index 100%
rename from sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandlerTest.java
rename to sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandlerTest.java
diff --git a/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfileHandlerTest.java b/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfileHandlerTest.java
similarity index 100%
rename from sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfileHandlerTest.java
rename to sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfileHandlerTest.java
diff --git a/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfilesHandlerTest.java b/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfilesHandlerTest.java
similarity index 100%
rename from sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfilesHandlerTest.java
rename to sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfilesHandlerTest.java
diff --git a/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImageHandlerTest.java b/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImageHandlerTest.java
similarity index 100%
rename from sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImageHandlerTest.java
rename to sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImageHandlerTest.java
diff --git a/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImagesHandlerTest.java b/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImagesHandlerTest.java
similarity index 100%
rename from sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImagesHandlerTest.java
rename to sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImagesHandlerTest.java
diff --git a/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceHandlerTest.java b/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceHandlerTest.java
similarity index 100%
rename from sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceHandlerTest.java
rename to sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceHandlerTest.java
diff --git a/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceStatesHandlerTest.java b/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceStatesHandlerTest.java
similarity index 100%
rename from sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceStatesHandlerTest.java
rename to sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceStatesHandlerTest.java
diff --git a/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstancesHandlerTest.java b/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstancesHandlerTest.java
similarity index 100%
rename from sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstancesHandlerTest.java
rename to sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstancesHandlerTest.java
diff --git a/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmHandlerTest.java b/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmHandlerTest.java
similarity index 100%
rename from sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmHandlerTest.java
rename to sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmHandlerTest.java
diff --git a/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmsHandlerTest.java b/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmsHandlerTest.java
similarity index 100%
rename from sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmsHandlerTest.java
rename to sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmsHandlerTest.java
diff --git a/sandbox/deltacloud/src/test/resources/links.xml b/sandbox-apis/sandbox/deltacloud/src/test/resources/links.xml
similarity index 100%
rename from sandbox/deltacloud/src/test/resources/links.xml
rename to sandbox-apis/sandbox/deltacloud/src/test/resources/links.xml
diff --git a/sandbox/deltacloud/src/test/resources/log4j.xml b/sandbox-apis/sandbox/deltacloud/src/test/resources/log4j.xml
similarity index 100%
rename from sandbox/deltacloud/src/test/resources/log4j.xml
rename to sandbox-apis/sandbox/deltacloud/src/test/resources/log4j.xml
diff --git a/sandbox/deltacloud/src/test/resources/test_get_hardware_profile.xml b/sandbox-apis/sandbox/deltacloud/src/test/resources/test_get_hardware_profile.xml
similarity index 100%
rename from sandbox/deltacloud/src/test/resources/test_get_hardware_profile.xml
rename to sandbox-apis/sandbox/deltacloud/src/test/resources/test_get_hardware_profile.xml
diff --git a/sandbox/deltacloud/src/test/resources/test_get_image.xml b/sandbox-apis/sandbox/deltacloud/src/test/resources/test_get_image.xml
similarity index 100%
rename from sandbox/deltacloud/src/test/resources/test_get_image.xml
rename to sandbox-apis/sandbox/deltacloud/src/test/resources/test_get_image.xml
diff --git a/sandbox/deltacloud/src/test/resources/test_get_instance.xml b/sandbox-apis/sandbox/deltacloud/src/test/resources/test_get_instance.xml
similarity index 100%
rename from sandbox/deltacloud/src/test/resources/test_get_instance.xml
rename to sandbox-apis/sandbox/deltacloud/src/test/resources/test_get_instance.xml
diff --git a/sandbox/deltacloud/src/test/resources/test_get_realm.xml b/sandbox-apis/sandbox/deltacloud/src/test/resources/test_get_realm.xml
similarity index 100%
rename from sandbox/deltacloud/src/test/resources/test_get_realm.xml
rename to sandbox-apis/sandbox/deltacloud/src/test/resources/test_get_realm.xml
diff --git a/sandbox/deltacloud/src/test/resources/test_get_states.xml b/sandbox-apis/sandbox/deltacloud/src/test/resources/test_get_states.xml
similarity index 100%
rename from sandbox/deltacloud/src/test/resources/test_get_states.xml
rename to sandbox-apis/sandbox/deltacloud/src/test/resources/test_get_states.xml
diff --git a/sandbox/deltacloud/src/test/resources/test_list_hardware_profiles.xml b/sandbox-apis/sandbox/deltacloud/src/test/resources/test_list_hardware_profiles.xml
similarity index 100%
rename from sandbox/deltacloud/src/test/resources/test_list_hardware_profiles.xml
rename to sandbox-apis/sandbox/deltacloud/src/test/resources/test_list_hardware_profiles.xml
diff --git a/sandbox/deltacloud/src/test/resources/test_list_images.xml b/sandbox-apis/sandbox/deltacloud/src/test/resources/test_list_images.xml
similarity index 100%
rename from sandbox/deltacloud/src/test/resources/test_list_images.xml
rename to sandbox-apis/sandbox/deltacloud/src/test/resources/test_list_images.xml
diff --git a/sandbox/deltacloud/src/test/resources/test_list_instances.xml b/sandbox-apis/sandbox/deltacloud/src/test/resources/test_list_instances.xml
similarity index 100%
rename from sandbox/deltacloud/src/test/resources/test_list_instances.xml
rename to sandbox-apis/sandbox/deltacloud/src/test/resources/test_list_instances.xml
diff --git a/sandbox/deltacloud/src/test/resources/test_list_realms.xml b/sandbox-apis/sandbox/deltacloud/src/test/resources/test_list_realms.xml
similarity index 100%
rename from sandbox/deltacloud/src/test/resources/test_list_realms.xml
rename to sandbox-apis/sandbox/deltacloud/src/test/resources/test_list_realms.xml
diff --git a/sandbox/libvirt/README.txt b/sandbox-apis/sandbox/libvirt/README.txt
similarity index 100%
rename from sandbox/libvirt/README.txt
rename to sandbox-apis/sandbox/libvirt/README.txt
diff --git a/sandbox/libvirt/TODO b/sandbox-apis/sandbox/libvirt/TODO
similarity index 100%
rename from sandbox/libvirt/TODO
rename to sandbox-apis/sandbox/libvirt/TODO
diff --git a/sandbox/libvirt/pom.xml b/sandbox-apis/sandbox/libvirt/pom.xml
similarity index 100%
rename from sandbox/libvirt/pom.xml
rename to sandbox-apis/sandbox/libvirt/pom.xml
diff --git a/sandbox/libvirt/src/main/java/org/jclouds/libvirt/Datacenter.java b/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/Datacenter.java
similarity index 100%
rename from sandbox/libvirt/src/main/java/org/jclouds/libvirt/Datacenter.java
rename to sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/Datacenter.java
diff --git a/sandbox/libvirt/src/main/java/org/jclouds/libvirt/Image.java b/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/Image.java
similarity index 100%
rename from sandbox/libvirt/src/main/java/org/jclouds/libvirt/Image.java
rename to sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/Image.java
diff --git a/sandbox/libvirt/src/main/java/org/jclouds/libvirt/LibvirtConstants.java b/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/LibvirtConstants.java
similarity index 100%
rename from sandbox/libvirt/src/main/java/org/jclouds/libvirt/LibvirtConstants.java
rename to sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/LibvirtConstants.java
diff --git a/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeService.java b/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeService.java
similarity index 100%
rename from sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeService.java
rename to sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeService.java
diff --git a/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilder.java b/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilder.java
similarity index 100%
rename from sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilder.java
rename to sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilder.java
diff --git a/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextSpec.java b/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextSpec.java
similarity index 100%
rename from sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextSpec.java
rename to sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextSpec.java
diff --git a/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtPropertiesBuilder.java b/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtPropertiesBuilder.java
similarity index 100%
rename from sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtPropertiesBuilder.java
rename to sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtPropertiesBuilder.java
diff --git a/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/domain/LibvirtComputeServiceContextModule.java b/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/domain/LibvirtComputeServiceContextModule.java
similarity index 100%
rename from sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/domain/LibvirtComputeServiceContextModule.java
rename to sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/domain/LibvirtComputeServiceContextModule.java
diff --git a/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DatacenterToLocation.java b/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DatacenterToLocation.java
similarity index 100%
rename from sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DatacenterToLocation.java
rename to sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DatacenterToLocation.java
diff --git a/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToHardware.java b/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToHardware.java
similarity index 100%
rename from sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToHardware.java
rename to sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToHardware.java
diff --git a/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToNodeMetadata.java b/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToNodeMetadata.java
similarity index 100%
rename from sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToNodeMetadata.java
rename to sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToNodeMetadata.java
diff --git a/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtImageToImage.java b/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtImageToImage.java
similarity index 100%
rename from sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtImageToImage.java
rename to sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtImageToImage.java
diff --git a/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtNodeToLocation.java b/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtNodeToLocation.java
similarity index 100%
rename from sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtNodeToLocation.java
rename to sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtNodeToLocation.java
diff --git a/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/strategy/LibvirtComputeServiceAdapter.java b/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/strategy/LibvirtComputeServiceAdapter.java
similarity index 100%
rename from sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/strategy/LibvirtComputeServiceAdapter.java
rename to sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/strategy/LibvirtComputeServiceAdapter.java
diff --git a/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilderTest.java b/sandbox-apis/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilderTest.java
similarity index 100%
rename from sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilderTest.java
rename to sandbox-apis/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilderTest.java
diff --git a/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceLiveTest.java b/sandbox-apis/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceLiveTest.java
similarity index 100%
rename from sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceLiveTest.java
rename to sandbox-apis/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceLiveTest.java
diff --git a/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtExperimentLiveTest.java b/sandbox-apis/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtExperimentLiveTest.java
similarity index 100%
rename from sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtExperimentLiveTest.java
rename to sandbox-apis/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtExperimentLiveTest.java
diff --git a/sandbox/libvirt/src/test/resources/log4j.xml b/sandbox-apis/sandbox/libvirt/src/test/resources/log4j.xml
similarity index 100%
rename from sandbox/libvirt/src/test/resources/log4j.xml
rename to sandbox-apis/sandbox/libvirt/src/test/resources/log4j.xml
diff --git a/sandbox/nova-ec2/pom.xml b/sandbox-apis/sandbox/nova-ec2/pom.xml
similarity index 100%
rename from sandbox/nova-ec2/pom.xml
rename to sandbox-apis/sandbox/nova-ec2/pom.xml
diff --git a/sandbox/nova-ec2/src/main/java/org/jclouds/nova/ec2/NovaEC2PropertiesBuilder.java b/sandbox-apis/sandbox/nova-ec2/src/main/java/org/jclouds/nova/ec2/NovaEC2PropertiesBuilder.java
similarity index 100%
rename from sandbox/nova-ec2/src/main/java/org/jclouds/nova/ec2/NovaEC2PropertiesBuilder.java
rename to sandbox-apis/sandbox/nova-ec2/src/main/java/org/jclouds/nova/ec2/NovaEC2PropertiesBuilder.java
diff --git a/sandbox/nova-ec2/src/test/java/org/jclouds/nova/ec2/compute/NovaEC2ComputeServiceLiveTest.java b/sandbox-apis/sandbox/nova-ec2/src/test/java/org/jclouds/nova/ec2/compute/NovaEC2ComputeServiceLiveTest.java
similarity index 100%
rename from sandbox/nova-ec2/src/test/java/org/jclouds/nova/ec2/compute/NovaEC2ComputeServiceLiveTest.java
rename to sandbox-apis/sandbox/nova-ec2/src/test/java/org/jclouds/nova/ec2/compute/NovaEC2ComputeServiceLiveTest.java
diff --git a/sandbox/nova-ec2/src/test/java/org/jclouds/nova/ec2/compute/NovaEC2TemplateBuilderLiveTest.java b/sandbox-apis/sandbox/nova-ec2/src/test/java/org/jclouds/nova/ec2/compute/NovaEC2TemplateBuilderLiveTest.java
similarity index 100%
rename from sandbox/nova-ec2/src/test/java/org/jclouds/nova/ec2/compute/NovaEC2TemplateBuilderLiveTest.java
rename to sandbox-apis/sandbox/nova-ec2/src/test/java/org/jclouds/nova/ec2/compute/NovaEC2TemplateBuilderLiveTest.java
diff --git a/sandbox/pcs2/README.txt b/sandbox-apis/sandbox/pcs/README.txt
similarity index 100%
rename from sandbox/pcs2/README.txt
rename to sandbox-apis/sandbox/pcs/README.txt
diff --git a/sandbox/pcs2/pom.xml b/sandbox-apis/sandbox/pcs/pom.xml
similarity index 100%
rename from sandbox/pcs2/pom.xml
rename to sandbox-apis/sandbox/pcs/pom.xml
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/PCSAsyncClient.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSAsyncClient.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/PCSAsyncClient.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSAsyncClient.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/PCSClient.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSClient.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/PCSClient.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSClient.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/PCSCloudAsyncClient.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSCloudAsyncClient.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/PCSCloudAsyncClient.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSCloudAsyncClient.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/PCSContextBuilder.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSContextBuilder.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/PCSContextBuilder.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSContextBuilder.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayload.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayload.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayload.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayload.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayload.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayload.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayload.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayload.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/binders/BindPCSFileToMultipartForm.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindPCSFileToMultipartForm.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/binders/BindPCSFileToMultipartForm.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindPCSFileToMultipartForm.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToFileInfo.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToFileInfo.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToFileInfo.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToFileInfo.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToPCSFile.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToPCSFile.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToPCSFile.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToPCSFile.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/FileInfoToBlobMetadata.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/FileInfoToBlobMetadata.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/FileInfoToBlobMetadata.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/FileInfoToBlobMetadata.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/PCSFileToBlob.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/PCSFileToBlob.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/PCSFileToBlob.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/PCSFileToBlob.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/config/PCSObjectModule.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/config/PCSObjectModule.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/config/PCSObjectModule.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/config/PCSObjectModule.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/config/PCSRestClientModule.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/config/PCSRestClientModule.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/config/PCSRestClientModule.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/config/PCSRestClientModule.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerInfo.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerInfo.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerInfo.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerInfo.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerList.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerList.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerList.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerList.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfo.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfo.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfo.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfo.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfoWithMetadata.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfoWithMetadata.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfoWithMetadata.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfoWithMetadata.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableFileInfo.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableFileInfo.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableFileInfo.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableFileInfo.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableResourceInfo.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableResourceInfo.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableResourceInfo.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableResourceInfo.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/PCSFile.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/PCSFile.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/PCSFile.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/PCSFile.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/ResourceInfo.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ResourceInfo.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/ResourceInfo.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ResourceInfo.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerInfoImpl.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerInfoImpl.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerInfoImpl.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerInfoImpl.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerListImpl.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerListImpl.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerListImpl.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerListImpl.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoImpl.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoImpl.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoImpl.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoImpl.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoWithMetadataImpl.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoWithMetadataImpl.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoWithMetadataImpl.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoWithMetadataImpl.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableFileInfoImpl.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableFileInfoImpl.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableFileInfoImpl.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableFileInfoImpl.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableResourceInfoImpl.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableResourceInfoImpl.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableResourceInfoImpl.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableResourceInfoImpl.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/PCSFileImpl.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/PCSFileImpl.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/PCSFileImpl.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/PCSFileImpl.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ResourceInfoImpl.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ResourceInfoImpl.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ResourceInfoImpl.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ResourceInfoImpl.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Contacts.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Contacts.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Contacts.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Contacts.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Metacontainers.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Metacontainers.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Metacontainers.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Metacontainers.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Projects.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Projects.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Projects.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Projects.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Recyclebin.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Recyclebin.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Recyclebin.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Recyclebin.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/endpoints/RootContainer.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/RootContainer.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/endpoints/RootContainer.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/RootContainer.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Shares.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Shares.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Shares.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Shares.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Tags.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Tags.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Tags.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Tags.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/endpoints/WebDAV.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/WebDAV.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/endpoints/WebDAV.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/WebDAV.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/functions/AddMetadataItemIntoMap.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/AddMetadataItemIntoMap.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/functions/AddMetadataItemIntoMap.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/AddMetadataItemIntoMap.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnFalseIfContainerNotFound.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnFalseIfContainerNotFound.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnFalseIfContainerNotFound.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnFalseIfContainerNotFound.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnTrueIfContainerAlreadyExists.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnTrueIfContainerAlreadyExists.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnTrueIfContainerAlreadyExists.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnTrueIfContainerAlreadyExists.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/handlers/PCSClientErrorRetryHandler.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/handlers/PCSClientErrorRetryHandler.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/handlers/PCSClientErrorRetryHandler.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/handlers/PCSClientErrorRetryHandler.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/options/PutBlockOptions.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/options/PutBlockOptions.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/options/PutBlockOptions.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/options/PutBlockOptions.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHandler.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHandler.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHandler.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHandler.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/xml/ContainerHandler.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/ContainerHandler.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/xml/ContainerHandler.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/ContainerHandler.java
diff --git a/sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/xml/FileHandler.java b/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/FileHandler.java
similarity index 100%
rename from sandbox/pcs2/src/main/java/org/jclouds/mezeo/pcs2/xml/FileHandler.java
rename to sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/FileHandler.java
diff --git a/sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/PCSAsyncClientTest.java b/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSAsyncClientTest.java
similarity index 100%
rename from sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/PCSAsyncClientTest.java
rename to sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSAsyncClientTest.java
diff --git a/sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/PCSClientLiveTest.java b/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSClientLiveTest.java
similarity index 100%
rename from sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/PCSClientLiveTest.java
rename to sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSClientLiveTest.java
diff --git a/sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/PCSCloudTest.java b/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSCloudTest.java
similarity index 100%
rename from sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/PCSCloudTest.java
rename to sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSCloudTest.java
diff --git a/sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/ProvidersInPropertiesTest.java b/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/ProvidersInPropertiesTest.java
similarity index 100%
rename from sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/ProvidersInPropertiesTest.java
rename to sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/ProvidersInPropertiesTest.java
diff --git a/sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayloadTest.java b/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayloadTest.java
similarity index 100%
rename from sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayloadTest.java
rename to sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayloadTest.java
diff --git a/sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayloadTest.java b/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayloadTest.java
similarity index 100%
rename from sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayloadTest.java
rename to sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayloadTest.java
diff --git a/sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/functions/AddMetadataAndReturnIdTest.java b/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/functions/AddMetadataAndReturnIdTest.java
similarity index 100%
rename from sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/functions/AddMetadataAndReturnIdTest.java
rename to sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/functions/AddMetadataAndReturnIdTest.java
diff --git a/sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/functions/AssembleBlobFromBlobMetadataCallTest.java b/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/functions/AssembleBlobFromBlobMetadataCallTest.java
similarity index 100%
rename from sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/functions/AssembleBlobFromBlobMetadataCallTest.java
rename to sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/functions/AssembleBlobFromBlobMetadataCallTest.java
diff --git a/sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/internal/StubPCSAsyncClient.java b/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/internal/StubPCSAsyncClient.java
similarity index 100%
rename from sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/internal/StubPCSAsyncClient.java
rename to sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/internal/StubPCSAsyncClient.java
diff --git a/sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/options/PutBlockOptionsTest.java b/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/options/PutBlockOptionsTest.java
similarity index 100%
rename from sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/options/PutBlockOptionsTest.java
rename to sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/options/PutBlockOptionsTest.java
diff --git a/sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHanderTest.java b/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHanderTest.java
similarity index 100%
rename from sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHanderTest.java
rename to sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHanderTest.java
diff --git a/sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/xml/ContainerHandlerTest.java b/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/ContainerHandlerTest.java
similarity index 100%
rename from sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/xml/ContainerHandlerTest.java
rename to sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/ContainerHandlerTest.java
diff --git a/sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/xml/FileMetadataHandlerTest.java b/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/FileMetadataHandlerTest.java
similarity index 100%
rename from sandbox/pcs2/src/test/java/org/jclouds/mezeo/pcs2/xml/FileMetadataHandlerTest.java
rename to sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/FileMetadataHandlerTest.java
diff --git a/sandbox/pcs2/src/test/resources/discovery.xml b/sandbox-apis/sandbox/pcs/src/test/resources/discovery.xml
similarity index 100%
rename from sandbox/pcs2/src/test/resources/discovery.xml
rename to sandbox-apis/sandbox/pcs/src/test/resources/discovery.xml
diff --git a/sandbox/pcs2/src/test/resources/log4j.xml b/sandbox-apis/sandbox/pcs/src/test/resources/log4j.xml
similarity index 100%
rename from sandbox/pcs2/src/test/resources/log4j.xml
rename to sandbox-apis/sandbox/pcs/src/test/resources/log4j.xml
diff --git a/sandbox/pcs2/src/test/resources/test_file_metadata.xml b/sandbox-apis/sandbox/pcs/src/test/resources/test_file_metadata.xml
similarity index 100%
rename from sandbox/pcs2/src/test/resources/test_file_metadata.xml
rename to sandbox-apis/sandbox/pcs/src/test/resources/test_file_metadata.xml
diff --git a/sandbox/pcs2/src/test/resources/test_root_container.xml b/sandbox-apis/sandbox/pcs/src/test/resources/test_root_container.xml
similarity index 100%
rename from sandbox/pcs2/src/test/resources/test_root_container.xml
rename to sandbox-apis/sandbox/pcs/src/test/resources/test_root_container.xml
diff --git a/sandbox/simpledb/pom.xml b/sandbox-apis/sandbox/simpledb/pom.xml
similarity index 100%
rename from sandbox/simpledb/pom.xml
rename to sandbox-apis/sandbox/simpledb/pom.xml
diff --git a/sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBAsyncClient.java b/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBAsyncClient.java
similarity index 100%
rename from sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBAsyncClient.java
rename to sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBAsyncClient.java
diff --git a/sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBClient.java b/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBClient.java
similarity index 100%
rename from sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBClient.java
rename to sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBClient.java
diff --git a/sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBContextBuilder.java b/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBContextBuilder.java
similarity index 100%
rename from sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBContextBuilder.java
rename to sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBContextBuilder.java
diff --git a/sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBPropertiesBuilder.java b/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBPropertiesBuilder.java
similarity index 100%
rename from sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBPropertiesBuilder.java
rename to sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBPropertiesBuilder.java
diff --git a/sandbox/simpledb/src/main/java/org/jclouds/simpledb/binders/BindAttributesToIndexedFormParams.java b/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/binders/BindAttributesToIndexedFormParams.java
similarity index 100%
rename from sandbox/simpledb/src/main/java/org/jclouds/simpledb/binders/BindAttributesToIndexedFormParams.java
rename to sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/binders/BindAttributesToIndexedFormParams.java
diff --git a/sandbox/simpledb/src/main/java/org/jclouds/simpledb/config/SimpleDBRestClientModule.java b/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/config/SimpleDBRestClientModule.java
similarity index 100%
rename from sandbox/simpledb/src/main/java/org/jclouds/simpledb/config/SimpleDBRestClientModule.java
rename to sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/config/SimpleDBRestClientModule.java
diff --git a/sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/AttributePair.java b/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/AttributePair.java
similarity index 100%
rename from sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/AttributePair.java
rename to sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/AttributePair.java
diff --git a/sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/DomainMetadata.java b/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/DomainMetadata.java
similarity index 100%
rename from sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/DomainMetadata.java
rename to sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/DomainMetadata.java
diff --git a/sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/Item.java b/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/Item.java
similarity index 100%
rename from sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/Item.java
rename to sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/Item.java
diff --git a/sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/ListDomainsResponse.java b/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/ListDomainsResponse.java
similarity index 100%
rename from sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/ListDomainsResponse.java
rename to sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/ListDomainsResponse.java
diff --git a/sandbox/simpledb/src/main/java/org/jclouds/simpledb/options/ListDomainsOptions.java b/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/options/ListDomainsOptions.java
similarity index 100%
rename from sandbox/simpledb/src/main/java/org/jclouds/simpledb/options/ListDomainsOptions.java
rename to sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/options/ListDomainsOptions.java
diff --git a/sandbox/simpledb/src/main/java/org/jclouds/simpledb/package-info.java b/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/package-info.java
similarity index 100%
rename from sandbox/simpledb/src/main/java/org/jclouds/simpledb/package-info.java
rename to sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/package-info.java
diff --git a/sandbox/simpledb/src/main/java/org/jclouds/simpledb/reference/SimpleDBParameters.java b/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/reference/SimpleDBParameters.java
similarity index 100%
rename from sandbox/simpledb/src/main/java/org/jclouds/simpledb/reference/SimpleDBParameters.java
rename to sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/reference/SimpleDBParameters.java
diff --git a/sandbox/simpledb/src/main/java/org/jclouds/simpledb/reference/package-info.java b/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/reference/package-info.java
similarity index 100%
rename from sandbox/simpledb/src/main/java/org/jclouds/simpledb/reference/package-info.java
rename to sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/reference/package-info.java
diff --git a/sandbox/simpledb/src/main/java/org/jclouds/simpledb/xml/ItemsHandler.java b/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/xml/ItemsHandler.java
similarity index 100%
rename from sandbox/simpledb/src/main/java/org/jclouds/simpledb/xml/ItemsHandler.java
rename to sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/xml/ItemsHandler.java
diff --git a/sandbox/simpledb/src/main/java/org/jclouds/simpledb/xml/ListDomainsResponseHandler.java b/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/xml/ListDomainsResponseHandler.java
similarity index 100%
rename from sandbox/simpledb/src/main/java/org/jclouds/simpledb/xml/ListDomainsResponseHandler.java
rename to sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/xml/ListDomainsResponseHandler.java
diff --git a/sandbox/simpledb/src/test/java/org/jclouds/simpledb/ProvidersInPropertiesTest.java b/sandbox-apis/sandbox/simpledb/src/test/java/org/jclouds/simpledb/ProvidersInPropertiesTest.java
similarity index 100%
rename from sandbox/simpledb/src/test/java/org/jclouds/simpledb/ProvidersInPropertiesTest.java
rename to sandbox-apis/sandbox/simpledb/src/test/java/org/jclouds/simpledb/ProvidersInPropertiesTest.java
diff --git a/sandbox/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBAsyncClientTest.java b/sandbox-apis/sandbox/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBAsyncClientTest.java
similarity index 100%
rename from sandbox/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBAsyncClientTest.java
rename to sandbox-apis/sandbox/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBAsyncClientTest.java
diff --git a/sandbox/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBClientLiveTest.java b/sandbox-apis/sandbox/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBClientLiveTest.java
similarity index 100%
rename from sandbox/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBClientLiveTest.java
rename to sandbox-apis/sandbox/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBClientLiveTest.java
diff --git a/sandbox/simpledb/src/test/java/org/jclouds/simpledb/options/ListDomainsOptionsTest.java b/sandbox-apis/sandbox/simpledb/src/test/java/org/jclouds/simpledb/options/ListDomainsOptionsTest.java
similarity index 100%
rename from sandbox/simpledb/src/test/java/org/jclouds/simpledb/options/ListDomainsOptionsTest.java
rename to sandbox-apis/sandbox/simpledb/src/test/java/org/jclouds/simpledb/options/ListDomainsOptionsTest.java
diff --git a/sandbox/simpledb/src/test/java/org/jclouds/simpledb/xml/ListDomainsResponseHandlerTest.java b/sandbox-apis/sandbox/simpledb/src/test/java/org/jclouds/simpledb/xml/ListDomainsResponseHandlerTest.java
similarity index 100%
rename from sandbox/simpledb/src/test/java/org/jclouds/simpledb/xml/ListDomainsResponseHandlerTest.java
rename to sandbox-apis/sandbox/simpledb/src/test/java/org/jclouds/simpledb/xml/ListDomainsResponseHandlerTest.java
diff --git a/sandbox/simpledb/src/test/resources/list_domains.xml b/sandbox-apis/sandbox/simpledb/src/test/resources/list_domains.xml
similarity index 100%
rename from sandbox/simpledb/src/test/resources/list_domains.xml
rename to sandbox-apis/sandbox/simpledb/src/test/resources/list_domains.xml
diff --git a/sandbox/simpledb/src/test/resources/log4j.xml b/sandbox-apis/sandbox/simpledb/src/test/resources/log4j.xml
similarity index 100%
rename from sandbox/simpledb/src/test/resources/log4j.xml
rename to sandbox-apis/sandbox/simpledb/src/test/resources/log4j.xml
diff --git a/sandbox/sqs/pom.xml b/sandbox-apis/sandbox/sqs/pom.xml
similarity index 100%
rename from sandbox/sqs/pom.xml
rename to sandbox-apis/sandbox/sqs/pom.xml
diff --git a/sandbox/sqs/src/main/java/org/jclouds/sqs/SQSAsyncClient.java b/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/SQSAsyncClient.java
similarity index 100%
rename from sandbox/sqs/src/main/java/org/jclouds/sqs/SQSAsyncClient.java
rename to sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/SQSAsyncClient.java
diff --git a/sandbox/sqs/src/main/java/org/jclouds/sqs/SQSClient.java b/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/SQSClient.java
similarity index 100%
rename from sandbox/sqs/src/main/java/org/jclouds/sqs/SQSClient.java
rename to sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/SQSClient.java
diff --git a/sandbox/sqs/src/main/java/org/jclouds/sqs/SQSContextBuilder.java b/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/SQSContextBuilder.java
similarity index 100%
rename from sandbox/sqs/src/main/java/org/jclouds/sqs/SQSContextBuilder.java
rename to sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/SQSContextBuilder.java
diff --git a/sandbox/sqs/src/main/java/org/jclouds/sqs/SQSPropertiesBuilder.java b/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/SQSPropertiesBuilder.java
similarity index 100%
rename from sandbox/sqs/src/main/java/org/jclouds/sqs/SQSPropertiesBuilder.java
rename to sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/SQSPropertiesBuilder.java
diff --git a/sandbox/sqs/src/main/java/org/jclouds/sqs/config/SQSRestClientModule.java b/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/config/SQSRestClientModule.java
similarity index 100%
rename from sandbox/sqs/src/main/java/org/jclouds/sqs/config/SQSRestClientModule.java
rename to sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/config/SQSRestClientModule.java
diff --git a/sandbox/sqs/src/main/java/org/jclouds/sqs/domain/Queue.java b/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/domain/Queue.java
similarity index 100%
rename from sandbox/sqs/src/main/java/org/jclouds/sqs/domain/Queue.java
rename to sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/domain/Queue.java
diff --git a/sandbox/sqs/src/main/java/org/jclouds/sqs/functions/QueueLocation.java b/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/functions/QueueLocation.java
similarity index 100%
rename from sandbox/sqs/src/main/java/org/jclouds/sqs/functions/QueueLocation.java
rename to sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/functions/QueueLocation.java
diff --git a/sandbox/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java b/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java
similarity index 100%
rename from sandbox/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java
rename to sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java
diff --git a/sandbox/sqs/src/main/java/org/jclouds/sqs/options/ListQueuesOptions.java b/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/options/ListQueuesOptions.java
similarity index 100%
rename from sandbox/sqs/src/main/java/org/jclouds/sqs/options/ListQueuesOptions.java
rename to sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/options/ListQueuesOptions.java
diff --git a/sandbox/sqs/src/main/java/org/jclouds/sqs/package-info.java b/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/package-info.java
similarity index 100%
rename from sandbox/sqs/src/main/java/org/jclouds/sqs/package-info.java
rename to sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/package-info.java
diff --git a/sandbox/sqs/src/main/java/org/jclouds/sqs/reference/SQSParameters.java b/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/reference/SQSParameters.java
similarity index 100%
rename from sandbox/sqs/src/main/java/org/jclouds/sqs/reference/SQSParameters.java
rename to sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/reference/SQSParameters.java
diff --git a/sandbox/sqs/src/main/java/org/jclouds/sqs/reference/package-info.java b/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/reference/package-info.java
similarity index 100%
rename from sandbox/sqs/src/main/java/org/jclouds/sqs/reference/package-info.java
rename to sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/reference/package-info.java
diff --git a/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/ListQueuesResponseHandler.java b/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/ListQueuesResponseHandler.java
similarity index 100%
rename from sandbox/sqs/src/main/java/org/jclouds/sqs/xml/ListQueuesResponseHandler.java
rename to sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/ListQueuesResponseHandler.java
diff --git a/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/MD5Handler.java b/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/MD5Handler.java
similarity index 100%
rename from sandbox/sqs/src/main/java/org/jclouds/sqs/xml/MD5Handler.java
rename to sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/MD5Handler.java
diff --git a/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/QueueHandler.java b/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/QueueHandler.java
similarity index 100%
rename from sandbox/sqs/src/main/java/org/jclouds/sqs/xml/QueueHandler.java
rename to sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/QueueHandler.java
diff --git a/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/RegexListQueuesResponseHandler.java b/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/RegexListQueuesResponseHandler.java
similarity index 100%
rename from sandbox/sqs/src/main/java/org/jclouds/sqs/xml/RegexListQueuesResponseHandler.java
rename to sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/RegexListQueuesResponseHandler.java
diff --git a/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/RegexMD5Handler.java b/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/RegexMD5Handler.java
similarity index 100%
rename from sandbox/sqs/src/main/java/org/jclouds/sqs/xml/RegexMD5Handler.java
rename to sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/RegexMD5Handler.java
diff --git a/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/RegexQueueHandler.java b/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/RegexQueueHandler.java
similarity index 100%
rename from sandbox/sqs/src/main/java/org/jclouds/sqs/xml/RegexQueueHandler.java
rename to sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/RegexQueueHandler.java
diff --git a/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/internal/BaseRegexQueueHandler.java b/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/internal/BaseRegexQueueHandler.java
similarity index 100%
rename from sandbox/sqs/src/main/java/org/jclouds/sqs/xml/internal/BaseRegexQueueHandler.java
rename to sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/internal/BaseRegexQueueHandler.java
diff --git a/sandbox/sqs/src/test/java/org/jclouds/sqs/SQSAsyncClientTest.java b/sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/SQSAsyncClientTest.java
similarity index 100%
rename from sandbox/sqs/src/test/java/org/jclouds/sqs/SQSAsyncClientTest.java
rename to sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/SQSAsyncClientTest.java
diff --git a/sandbox/sqs/src/test/java/org/jclouds/sqs/SQSClientLiveTest.java b/sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/SQSClientLiveTest.java
similarity index 100%
rename from sandbox/sqs/src/test/java/org/jclouds/sqs/SQSClientLiveTest.java
rename to sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/SQSClientLiveTest.java
diff --git a/sandbox/sqs/src/test/java/org/jclouds/sqs/config/SQSRestClientModuleTest.java b/sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/config/SQSRestClientModuleTest.java
similarity index 100%
rename from sandbox/sqs/src/test/java/org/jclouds/sqs/config/SQSRestClientModuleTest.java
rename to sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/config/SQSRestClientModuleTest.java
diff --git a/sandbox/sqs/src/test/java/org/jclouds/sqs/options/CreateQueueOptionsTest.java b/sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/options/CreateQueueOptionsTest.java
similarity index 100%
rename from sandbox/sqs/src/test/java/org/jclouds/sqs/options/CreateQueueOptionsTest.java
rename to sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/options/CreateQueueOptionsTest.java
diff --git a/sandbox/sqs/src/test/java/org/jclouds/sqs/options/ListQueuesOptionsTest.java b/sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/options/ListQueuesOptionsTest.java
similarity index 100%
rename from sandbox/sqs/src/test/java/org/jclouds/sqs/options/ListQueuesOptionsTest.java
rename to sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/options/ListQueuesOptionsTest.java
diff --git a/sandbox/sqs/src/test/java/org/jclouds/sqs/xml/ListQueuesResponseHandlerTest.java b/sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/xml/ListQueuesResponseHandlerTest.java
similarity index 100%
rename from sandbox/sqs/src/test/java/org/jclouds/sqs/xml/ListQueuesResponseHandlerTest.java
rename to sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/xml/ListQueuesResponseHandlerTest.java
diff --git a/sandbox/sqs/src/test/resources/list_queues.xml b/sandbox-apis/sandbox/sqs/src/test/resources/list_queues.xml
similarity index 100%
rename from sandbox/sqs/src/test/resources/list_queues.xml
rename to sandbox-apis/sandbox/sqs/src/test/resources/list_queues.xml
diff --git a/sandbox/sqs/src/test/resources/log4j.xml b/sandbox-apis/sandbox/sqs/src/test/resources/log4j.xml
similarity index 100%
rename from sandbox/sqs/src/test/resources/log4j.xml
rename to sandbox-apis/sandbox/sqs/src/test/resources/log4j.xml
diff --git a/sandbox/vsphere/README.txt b/sandbox-apis/sandbox/vsphere/README.txt
similarity index 100%
rename from sandbox/vsphere/README.txt
rename to sandbox-apis/sandbox/vsphere/README.txt
diff --git a/sandbox/vsphere/TODO b/sandbox-apis/sandbox/vsphere/TODO
similarity index 100%
rename from sandbox/vsphere/TODO
rename to sandbox-apis/sandbox/vsphere/TODO
diff --git a/sandbox/vsphere/pom.xml b/sandbox-apis/sandbox/vsphere/pom.xml
similarity index 100%
rename from sandbox/vsphere/pom.xml
rename to sandbox-apis/sandbox/vsphere/pom.xml
diff --git a/sandbox/vsphere/src/main/java/org/jclouds/vi/Image.java b/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/Image.java
similarity index 100%
rename from sandbox/vsphere/src/main/java/org/jclouds/vi/Image.java
rename to sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/Image.java
diff --git a/sandbox/vsphere/src/main/java/org/jclouds/vi/ViConstants.java b/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/ViConstants.java
similarity index 100%
rename from sandbox/vsphere/src/main/java/org/jclouds/vi/ViConstants.java
rename to sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/ViConstants.java
diff --git a/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeService.java b/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeService.java
similarity index 100%
rename from sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeService.java
rename to sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeService.java
diff --git a/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeServiceContextBuilder.java b/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeServiceContextBuilder.java
similarity index 100%
rename from sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeServiceContextBuilder.java
rename to sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeServiceContextBuilder.java
diff --git a/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeServiceContextSpec.java b/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeServiceContextSpec.java
similarity index 100%
rename from sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeServiceContextSpec.java
rename to sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeServiceContextSpec.java
diff --git a/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViPropertiesBuilder.java b/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViPropertiesBuilder.java
similarity index 100%
rename from sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViPropertiesBuilder.java
rename to sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViPropertiesBuilder.java
diff --git a/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/config/ViComputeServiceContextModule.java b/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/config/ViComputeServiceContextModule.java
similarity index 100%
rename from sandbox/vsphere/src/main/java/org/jclouds/vi/compute/config/ViComputeServiceContextModule.java
rename to sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/config/ViComputeServiceContextModule.java
diff --git a/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/DatacenterToLocation.java b/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/DatacenterToLocation.java
similarity index 100%
rename from sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/DatacenterToLocation.java
rename to sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/DatacenterToLocation.java
diff --git a/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/ViImageToImage.java b/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/ViImageToImage.java
similarity index 100%
rename from sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/ViImageToImage.java
rename to sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/ViImageToImage.java
diff --git a/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/VirtualMachineToHardware.java b/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/VirtualMachineToHardware.java
similarity index 100%
rename from sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/VirtualMachineToHardware.java
rename to sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/VirtualMachineToHardware.java
diff --git a/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/VirtualMachineToNodeMetadata.java b/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/VirtualMachineToNodeMetadata.java
similarity index 100%
rename from sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/VirtualMachineToNodeMetadata.java
rename to sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/VirtualMachineToNodeMetadata.java
diff --git a/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/strategy/ViComputeServiceAdapter.java b/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/strategy/ViComputeServiceAdapter.java
similarity index 100%
rename from sandbox/vsphere/src/main/java/org/jclouds/vi/compute/strategy/ViComputeServiceAdapter.java
rename to sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/strategy/ViComputeServiceAdapter.java
diff --git a/sandbox/vsphere/src/test/java/org/jclouds/vi/compute/ViComputeServiceContextBuilderTest.java b/sandbox-apis/sandbox/vsphere/src/test/java/org/jclouds/vi/compute/ViComputeServiceContextBuilderTest.java
similarity index 100%
rename from sandbox/vsphere/src/test/java/org/jclouds/vi/compute/ViComputeServiceContextBuilderTest.java
rename to sandbox-apis/sandbox/vsphere/src/test/java/org/jclouds/vi/compute/ViComputeServiceContextBuilderTest.java
diff --git a/sandbox/vsphere/src/test/java/org/jclouds/vi/compute/ViComputeServiceLiveTest.java b/sandbox-apis/sandbox/vsphere/src/test/java/org/jclouds/vi/compute/ViComputeServiceLiveTest.java
similarity index 100%
rename from sandbox/vsphere/src/test/java/org/jclouds/vi/compute/ViComputeServiceLiveTest.java
rename to sandbox-apis/sandbox/vsphere/src/test/java/org/jclouds/vi/compute/ViComputeServiceLiveTest.java
diff --git a/sandbox/vsphere/src/test/java/org/jclouds/vi/compute/ViExperimentLiveTest.java b/sandbox-apis/sandbox/vsphere/src/test/java/org/jclouds/vi/compute/ViExperimentLiveTest.java
similarity index 100%
rename from sandbox/vsphere/src/test/java/org/jclouds/vi/compute/ViExperimentLiveTest.java
rename to sandbox-apis/sandbox/vsphere/src/test/java/org/jclouds/vi/compute/ViExperimentLiveTest.java
diff --git a/sandbox/vsphere/src/test/resources/log4j.xml b/sandbox-apis/sandbox/vsphere/src/test/resources/log4j.xml
similarity index 100%
rename from sandbox/vsphere/src/test/resources/log4j.xml
rename to sandbox-apis/sandbox/vsphere/src/test/resources/log4j.xml
diff --git a/sandbox/ning/pom.xml b/sandbox-drivers/ning/pom.xml
similarity index 100%
rename from sandbox/ning/pom.xml
rename to sandbox-drivers/ning/pom.xml
diff --git a/sandbox/ning/src/main/java/org/jclouds/http/ning/NingHttpCommandExecutorService.java b/sandbox-drivers/ning/src/main/java/org/jclouds/http/ning/NingHttpCommandExecutorService.java
similarity index 100%
rename from sandbox/ning/src/main/java/org/jclouds/http/ning/NingHttpCommandExecutorService.java
rename to sandbox-drivers/ning/src/main/java/org/jclouds/http/ning/NingHttpCommandExecutorService.java
diff --git a/sandbox/ning/src/main/java/org/jclouds/http/ning/config/NingHttpCommandExecutorServiceModule.java b/sandbox-drivers/ning/src/main/java/org/jclouds/http/ning/config/NingHttpCommandExecutorServiceModule.java
similarity index 100%
rename from sandbox/ning/src/main/java/org/jclouds/http/ning/config/NingHttpCommandExecutorServiceModule.java
rename to sandbox-drivers/ning/src/main/java/org/jclouds/http/ning/config/NingHttpCommandExecutorServiceModule.java
diff --git a/sandbox/ning/src/test/java/org/jclouds/http/ning/NingHttpCommandExecutorServiceTest.java b/sandbox-drivers/ning/src/test/java/org/jclouds/http/ning/NingHttpCommandExecutorServiceTest.java
similarity index 100%
rename from sandbox/ning/src/test/java/org/jclouds/http/ning/NingHttpCommandExecutorServiceTest.java
rename to sandbox-drivers/ning/src/test/java/org/jclouds/http/ning/NingHttpCommandExecutorServiceTest.java
diff --git a/sandbox/ning/src/test/resources/test.jks b/sandbox-drivers/ning/src/test/resources/test.jks
similarity index 100%
rename from sandbox/ning/src/test/resources/test.jks
rename to sandbox-drivers/ning/src/test/resources/test.jks
diff --git a/sandbox/aws-simpledb/pom.xml b/sandbox-providers/aws-simpledb/pom.xml
similarity index 100%
rename from sandbox/aws-simpledb/pom.xml
rename to sandbox-providers/aws-simpledb/pom.xml
diff --git a/sandbox/aws-simpledb/src/main/java/org/jclouds/aws/simpledb/SimpleDBPropertiesBuilder.java b/sandbox-providers/aws-simpledb/src/main/java/org/jclouds/aws/simpledb/SimpleDBPropertiesBuilder.java
similarity index 100%
rename from sandbox/aws-simpledb/src/main/java/org/jclouds/aws/simpledb/SimpleDBPropertiesBuilder.java
rename to sandbox-providers/aws-simpledb/src/main/java/org/jclouds/aws/simpledb/SimpleDBPropertiesBuilder.java
diff --git a/sandbox/aws-simpledb/src/test/java/org/jclouds/aws/simpledb/AWSSimpleDBClientLiveTest.java b/sandbox-providers/aws-simpledb/src/test/java/org/jclouds/aws/simpledb/AWSSimpleDBClientLiveTest.java
similarity index 100%
rename from sandbox/aws-simpledb/src/test/java/org/jclouds/aws/simpledb/AWSSimpleDBClientLiveTest.java
rename to sandbox-providers/aws-simpledb/src/test/java/org/jclouds/aws/simpledb/AWSSimpleDBClientLiveTest.java
diff --git a/sandbox/aws-simpledb/src/test/java/org/jclouds/aws/simpledb/ProvidersInPropertiesTest.java b/sandbox-providers/aws-simpledb/src/test/java/org/jclouds/aws/simpledb/ProvidersInPropertiesTest.java
similarity index 100%
rename from sandbox/aws-simpledb/src/test/java/org/jclouds/aws/simpledb/ProvidersInPropertiesTest.java
rename to sandbox-providers/aws-simpledb/src/test/java/org/jclouds/aws/simpledb/ProvidersInPropertiesTest.java
diff --git a/sandbox/aws-simpledb/src/test/java/org/jclouds/aws/simpledb/SimpleDBAsyncClientTest.java b/sandbox-providers/aws-simpledb/src/test/java/org/jclouds/aws/simpledb/SimpleDBAsyncClientTest.java
similarity index 100%
rename from sandbox/aws-simpledb/src/test/java/org/jclouds/aws/simpledb/SimpleDBAsyncClientTest.java
rename to sandbox-providers/aws-simpledb/src/test/java/org/jclouds/aws/simpledb/SimpleDBAsyncClientTest.java
diff --git a/sandbox/boxdotnet/pom.xml b/sandbox-providers/boxdotnet/pom.xml
similarity index 100%
rename from sandbox/boxdotnet/pom.xml
rename to sandbox-providers/boxdotnet/pom.xml
diff --git a/sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetAsyncClient.java b/sandbox-providers/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetAsyncClient.java
similarity index 100%
rename from sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetAsyncClient.java
rename to sandbox-providers/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetAsyncClient.java
diff --git a/sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetClient.java b/sandbox-providers/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetClient.java
similarity index 100%
rename from sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetClient.java
rename to sandbox-providers/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetClient.java
diff --git a/sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetContextBuilder.java b/sandbox-providers/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetContextBuilder.java
similarity index 100%
rename from sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetContextBuilder.java
rename to sandbox-providers/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetContextBuilder.java
diff --git a/sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetPropertiesBuilder.java b/sandbox-providers/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetPropertiesBuilder.java
similarity index 100%
rename from sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetPropertiesBuilder.java
rename to sandbox-providers/boxdotnet/src/main/java/org/jclouds/boxdotnet/BoxDotNetPropertiesBuilder.java
diff --git a/sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/config/BoxDotNetRestClientModule.java b/sandbox-providers/boxdotnet/src/main/java/org/jclouds/boxdotnet/config/BoxDotNetRestClientModule.java
similarity index 100%
rename from sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/config/BoxDotNetRestClientModule.java
rename to sandbox-providers/boxdotnet/src/main/java/org/jclouds/boxdotnet/config/BoxDotNetRestClientModule.java
diff --git a/sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/handlers/BoxDotNetErrorHandler.java b/sandbox-providers/boxdotnet/src/main/java/org/jclouds/boxdotnet/handlers/BoxDotNetErrorHandler.java
similarity index 100%
rename from sandbox/boxdotnet/src/main/java/org/jclouds/boxdotnet/handlers/BoxDotNetErrorHandler.java
rename to sandbox-providers/boxdotnet/src/main/java/org/jclouds/boxdotnet/handlers/BoxDotNetErrorHandler.java
diff --git a/sandbox/boxdotnet/src/test/java/org/jclouds/boxdotnet/BoxDotNetAsyncClientTest.java b/sandbox-providers/boxdotnet/src/test/java/org/jclouds/boxdotnet/BoxDotNetAsyncClientTest.java
similarity index 100%
rename from sandbox/boxdotnet/src/test/java/org/jclouds/boxdotnet/BoxDotNetAsyncClientTest.java
rename to sandbox-providers/boxdotnet/src/test/java/org/jclouds/boxdotnet/BoxDotNetAsyncClientTest.java
diff --git a/sandbox/boxdotnet/src/test/java/org/jclouds/boxdotnet/BoxDotNetClientLiveTest.java b/sandbox-providers/boxdotnet/src/test/java/org/jclouds/boxdotnet/BoxDotNetClientLiveTest.java
similarity index 100%
rename from sandbox/boxdotnet/src/test/java/org/jclouds/boxdotnet/BoxDotNetClientLiveTest.java
rename to sandbox-providers/boxdotnet/src/test/java/org/jclouds/boxdotnet/BoxDotNetClientLiveTest.java
diff --git a/sandbox/boxdotnet/src/test/resources/log4j.xml b/sandbox-providers/boxdotnet/src/test/resources/log4j.xml
similarity index 100%
rename from sandbox/boxdotnet/src/test/resources/log4j.xml
rename to sandbox-providers/boxdotnet/src/test/resources/log4j.xml
diff --git a/sandbox/ibmdev/pom.xml b/sandbox-providers/ibmdev/pom.xml
similarity index 100%
rename from sandbox/ibmdev/pom.xml
rename to sandbox-providers/ibmdev/pom.xml
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClient.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClient.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClient.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClient.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudClient.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudClient.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudClient.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudClient.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudContextBuilder.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudContextBuilder.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudContextBuilder.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudContextBuilder.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudPropertiesBuilder.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudPropertiesBuilder.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudPropertiesBuilder.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudPropertiesBuilder.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudBindComputeStrategiesByClass.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudBindComputeStrategiesByClass.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudBindComputeStrategiesByClass.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudBindComputeStrategiesByClass.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudBindComputeSuppliersByClass.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudBindComputeSuppliersByClass.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudBindComputeSuppliersByClass.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudBindComputeSuppliersByClass.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceContextModule.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceContextModule.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceContextModule.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceContextModule.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceDependenciesModule.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceDependenciesModule.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceDependenciesModule.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceDependenciesModule.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/functions/InstanceToNodeMetadata.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/functions/InstanceToNodeMetadata.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/functions/InstanceToNodeMetadata.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/functions/InstanceToNodeMetadata.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/options/IBMDeveloperCloudTemplateOptions.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/options/IBMDeveloperCloudTemplateOptions.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/options/IBMDeveloperCloudTemplateOptions.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/options/IBMDeveloperCloudTemplateOptions.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/CreateKeyPairEncodeTagIntoNameRunNodesAndAddToSet.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/CreateKeyPairEncodeTagIntoNameRunNodesAndAddToSet.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/CreateKeyPairEncodeTagIntoNameRunNodesAndAddToSet.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/CreateKeyPairEncodeTagIntoNameRunNodesAndAddToSet.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudAddNodeWithTagStrategy.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudAddNodeWithTagStrategy.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudAddNodeWithTagStrategy.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudAddNodeWithTagStrategy.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudDestroyNodeStrategy.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudDestroyNodeStrategy.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudDestroyNodeStrategy.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudDestroyNodeStrategy.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudGetNodeMetadataStrategy.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudGetNodeMetadataStrategy.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudGetNodeMetadataStrategy.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudGetNodeMetadataStrategy.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudLifeCycleStrategy.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudLifeCycleStrategy.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudLifeCycleStrategy.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudLifeCycleStrategy.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudListNodesStrategy.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudListNodesStrategy.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudListNodesStrategy.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudListNodesStrategy.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudHardwareSupplier.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudHardwareSupplier.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudHardwareSupplier.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudHardwareSupplier.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudImageSupplier.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudImageSupplier.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudImageSupplier.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudImageSupplier.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudLocationSupplier.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudLocationSupplier.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudLocationSupplier.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudLocationSupplier.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudParserModule.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudParserModule.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudParserModule.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudParserModule.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudRestClientModule.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudRestClientModule.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudRestClientModule.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudRestClientModule.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Address.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Address.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Address.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Address.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Image.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Image.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Image.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Image.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Instance.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Instance.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Instance.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Instance.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/InstanceType.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/InstanceType.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/InstanceType.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/InstanceType.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Key.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Key.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Key.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Key.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Location.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Location.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Location.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Location.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Offering.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Offering.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Offering.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Offering.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Price.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Price.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Price.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Price.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/StorageOffering.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/StorageOffering.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/StorageOffering.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/StorageOffering.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Volume.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Volume.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Volume.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Volume.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/GetFirstInstanceInList.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/GetFirstInstanceInList.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/GetFirstInstanceInList.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/GetFirstInstanceInList.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressFromJson.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressFromJson.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressFromJson.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressFromJson.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressesFromJson.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressesFromJson.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressesFromJson.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressesFromJson.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJson.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJson.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJson.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJson.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImageFromJson.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImageFromJson.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImageFromJson.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImageFromJson.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImagesFromJson.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImagesFromJson.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImagesFromJson.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImagesFromJson.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstanceFromJson.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstanceFromJson.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstanceFromJson.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstanceFromJson.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstancesFromJson.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstancesFromJson.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstancesFromJson.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstancesFromJson.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseKeysFromJson.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseKeysFromJson.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseKeysFromJson.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseKeysFromJson.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseLongFromDate.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseLongFromDate.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseLongFromDate.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseLongFromDate.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseUtils.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseUtils.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseUtils.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseUtils.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumeFromJson.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumeFromJson.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumeFromJson.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumeFromJson.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumesFromJson.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumesFromJson.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumesFromJson.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumesFromJson.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/handlers/IBMDeveloperCloudErrorHandler.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/handlers/IBMDeveloperCloudErrorHandler.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/handlers/IBMDeveloperCloudErrorHandler.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/handlers/IBMDeveloperCloudErrorHandler.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/options/CreateInstanceOptions.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/options/CreateInstanceOptions.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/options/CreateInstanceOptions.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/options/CreateInstanceOptions.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/options/RestartInstanceOptions.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/options/RestartInstanceOptions.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/options/RestartInstanceOptions.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/options/RestartInstanceOptions.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/AddressFree.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/AddressFree.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/AddressFree.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/AddressFree.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActive.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActive.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActive.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActive.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActiveOrFailed.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActiveOrFailed.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActiveOrFailed.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActiveOrFailed.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceRemovedOrNotFound.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceRemovedOrNotFound.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceRemovedOrNotFound.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceRemovedOrNotFound.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/VolumeUnmounted.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/VolumeUnmounted.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/VolumeUnmounted.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/VolumeUnmounted.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/reference/IBMDeveloperCloudConstants.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/reference/IBMDeveloperCloudConstants.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/reference/IBMDeveloperCloudConstants.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/reference/IBMDeveloperCloudConstants.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationHandler.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationHandler.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationHandler.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationHandler.java
diff --git a/sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationsHandler.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationsHandler.java
similarity index 100%
rename from sandbox/ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationsHandler.java
rename to sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationsHandler.java
diff --git a/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClientTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClientTest.java
similarity index 100%
rename from sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClientTest.java
rename to sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClientTest.java
diff --git a/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudClientLiveTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudClientLiveTest.java
similarity index 100%
rename from sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudClientLiveTest.java
rename to sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudClientLiveTest.java
diff --git a/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/ProvidersInPropertiesTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/ProvidersInPropertiesTest.java
similarity index 100%
rename from sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/ProvidersInPropertiesTest.java
rename to sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/ProvidersInPropertiesTest.java
diff --git a/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTestDisabled.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTestDisabled.java
similarity index 100%
rename from sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTestDisabled.java
rename to sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTestDisabled.java
diff --git a/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudTemplateBuilderLiveTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudTemplateBuilderLiveTest.java
similarity index 100%
rename from sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudTemplateBuilderLiveTest.java
rename to sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudTemplateBuilderLiveTest.java
diff --git a/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceDependenciesModuleTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceDependenciesModuleTest.java
similarity index 100%
rename from sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceDependenciesModuleTest.java
rename to sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceDependenciesModuleTest.java
diff --git a/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressFromJsonTest.java
similarity index 100%
rename from sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressFromJsonTest.java
rename to sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressFromJsonTest.java
diff --git a/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressesFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressesFromJsonTest.java
similarity index 100%
rename from sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressesFromJsonTest.java
rename to sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressesFromJsonTest.java
diff --git a/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJsonTest.java
similarity index 100%
rename from sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJsonTest.java
rename to sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJsonTest.java
diff --git a/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImageFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImageFromJsonTest.java
similarity index 100%
rename from sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImageFromJsonTest.java
rename to sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImageFromJsonTest.java
diff --git a/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImagesFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImagesFromJsonTest.java
similarity index 100%
rename from sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImagesFromJsonTest.java
rename to sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImagesFromJsonTest.java
diff --git a/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstanceFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstanceFromJsonTest.java
similarity index 100%
rename from sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstanceFromJsonTest.java
rename to sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstanceFromJsonTest.java
diff --git a/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstancesFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstancesFromJsonTest.java
similarity index 100%
rename from sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstancesFromJsonTest.java
rename to sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstancesFromJsonTest.java
diff --git a/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeyFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeyFromJsonTest.java
similarity index 100%
rename from sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeyFromJsonTest.java
rename to sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeyFromJsonTest.java
diff --git a/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeysFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeysFromJsonTest.java
similarity index 100%
rename from sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeysFromJsonTest.java
rename to sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeysFromJsonTest.java
diff --git a/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseStorageOfferingsFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseStorageOfferingsFromJsonTest.java
similarity index 100%
rename from sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseStorageOfferingsFromJsonTest.java
rename to sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseStorageOfferingsFromJsonTest.java
diff --git a/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumeFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumeFromJsonTest.java
similarity index 100%
rename from sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumeFromJsonTest.java
rename to sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumeFromJsonTest.java
diff --git a/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumesFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumesFromJsonTest.java
similarity index 100%
rename from sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumesFromJsonTest.java
rename to sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumesFromJsonTest.java
diff --git a/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationHandlerTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationHandlerTest.java
similarity index 100%
rename from sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationHandlerTest.java
rename to sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationHandlerTest.java
diff --git a/sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationsHandlerTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationsHandlerTest.java
similarity index 100%
rename from sandbox/ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationsHandlerTest.java
rename to sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationsHandlerTest.java
diff --git a/sandbox/ibmdev/src/test/resources/address.json b/sandbox-providers/ibmdev/src/test/resources/address.json
similarity index 100%
rename from sandbox/ibmdev/src/test/resources/address.json
rename to sandbox-providers/ibmdev/src/test/resources/address.json
diff --git a/sandbox/ibmdev/src/test/resources/addresses.json b/sandbox-providers/ibmdev/src/test/resources/addresses.json
similarity index 100%
rename from sandbox/ibmdev/src/test/resources/addresses.json
rename to sandbox-providers/ibmdev/src/test/resources/addresses.json
diff --git a/sandbox/ibmdev/src/test/resources/image.json b/sandbox-providers/ibmdev/src/test/resources/image.json
similarity index 100%
rename from sandbox/ibmdev/src/test/resources/image.json
rename to sandbox-providers/ibmdev/src/test/resources/image.json
diff --git a/sandbox/ibmdev/src/test/resources/images.json b/sandbox-providers/ibmdev/src/test/resources/images.json
similarity index 100%
rename from sandbox/ibmdev/src/test/resources/images.json
rename to sandbox-providers/ibmdev/src/test/resources/images.json
diff --git a/sandbox/ibmdev/src/test/resources/instance.json b/sandbox-providers/ibmdev/src/test/resources/instance.json
similarity index 100%
rename from sandbox/ibmdev/src/test/resources/instance.json
rename to sandbox-providers/ibmdev/src/test/resources/instance.json
diff --git a/sandbox/ibmdev/src/test/resources/instances.json b/sandbox-providers/ibmdev/src/test/resources/instances.json
similarity index 100%
rename from sandbox/ibmdev/src/test/resources/instances.json
rename to sandbox-providers/ibmdev/src/test/resources/instances.json
diff --git a/sandbox/ibmdev/src/test/resources/key.json b/sandbox-providers/ibmdev/src/test/resources/key.json
similarity index 100%
rename from sandbox/ibmdev/src/test/resources/key.json
rename to sandbox-providers/ibmdev/src/test/resources/key.json
diff --git a/sandbox/ibmdev/src/test/resources/keys.json b/sandbox-providers/ibmdev/src/test/resources/keys.json
similarity index 100%
rename from sandbox/ibmdev/src/test/resources/keys.json
rename to sandbox-providers/ibmdev/src/test/resources/keys.json
diff --git a/sandbox/ibmdev/src/test/resources/location.xml b/sandbox-providers/ibmdev/src/test/resources/location.xml
similarity index 100%
rename from sandbox/ibmdev/src/test/resources/location.xml
rename to sandbox-providers/ibmdev/src/test/resources/location.xml
diff --git a/sandbox/ibmdev/src/test/resources/log4j.xml b/sandbox-providers/ibmdev/src/test/resources/log4j.xml
similarity index 100%
rename from sandbox/ibmdev/src/test/resources/log4j.xml
rename to sandbox-providers/ibmdev/src/test/resources/log4j.xml
diff --git a/sandbox/ibmdev/src/test/resources/storage-offerings.json b/sandbox-providers/ibmdev/src/test/resources/storage-offerings.json
similarity index 100%
rename from sandbox/ibmdev/src/test/resources/storage-offerings.json
rename to sandbox-providers/ibmdev/src/test/resources/storage-offerings.json
diff --git a/sandbox/ibmdev/src/test/resources/volume.json b/sandbox-providers/ibmdev/src/test/resources/volume.json
similarity index 100%
rename from sandbox/ibmdev/src/test/resources/volume.json
rename to sandbox-providers/ibmdev/src/test/resources/volume.json
diff --git a/sandbox/ibmdev/src/test/resources/volumes.json b/sandbox-providers/ibmdev/src/test/resources/volumes.json
similarity index 100%
rename from sandbox/ibmdev/src/test/resources/volumes.json
rename to sandbox-providers/ibmdev/src/test/resources/volumes.json
diff --git a/sandbox/rimuhosting/README.txt b/sandbox-providers/rimuhosting/README.txt
similarity index 100%
rename from sandbox/rimuhosting/README.txt
rename to sandbox-providers/rimuhosting/README.txt
diff --git a/sandbox/rimuhosting/pom.xml b/sandbox-providers/rimuhosting/pom.xml
similarity index 100%
rename from sandbox/rimuhosting/pom.xml
rename to sandbox-providers/rimuhosting/pom.xml
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingAsyncClient.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingAsyncClient.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingAsyncClient.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingAsyncClient.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingClient.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingClient.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingClient.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingClient.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingContextBuilder.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingContextBuilder.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingContextBuilder.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingContextBuilder.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingPropertiesBuilder.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingPropertiesBuilder.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingPropertiesBuilder.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingPropertiesBuilder.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/CreateServerOptions.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/CreateServerOptions.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/CreateServerOptions.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/CreateServerOptions.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/RimuHostingJsonBinder.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/RimuHostingJsonBinder.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/RimuHostingJsonBinder.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/RimuHostingJsonBinder.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/RimuHostingRebootJsonBinder.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/RimuHostingRebootJsonBinder.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/RimuHostingRebootJsonBinder.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/RimuHostingRebootJsonBinder.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingBindComputeStrategiesByClass.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingBindComputeStrategiesByClass.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingBindComputeStrategiesByClass.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingBindComputeStrategiesByClass.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingBindComputeSuppliersByClass.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingBindComputeSuppliersByClass.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingBindComputeSuppliersByClass.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingBindComputeSuppliersByClass.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingComputeServiceContextModule.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingComputeServiceContextModule.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingComputeServiceContextModule.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingComputeServiceContextModule.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingComputeServiceDependenciesModule.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingComputeServiceDependenciesModule.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingComputeServiceDependenciesModule.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingComputeServiceDependenciesModule.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/functions/ServerToNodeMetadata.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/functions/ServerToNodeMetadata.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/functions/ServerToNodeMetadata.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/functions/ServerToNodeMetadata.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/strategy/RimuHostingAddNodeWithTagStrategy.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/strategy/RimuHostingAddNodeWithTagStrategy.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/strategy/RimuHostingAddNodeWithTagStrategy.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/strategy/RimuHostingAddNodeWithTagStrategy.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/strategy/RimuHostingDestroyNodeStrategy.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/strategy/RimuHostingDestroyNodeStrategy.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/strategy/RimuHostingDestroyNodeStrategy.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/strategy/RimuHostingDestroyNodeStrategy.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/strategy/RimuHostingGetNodeMetadataStrategy.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/strategy/RimuHostingGetNodeMetadataStrategy.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/strategy/RimuHostingGetNodeMetadataStrategy.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/strategy/RimuHostingGetNodeMetadataStrategy.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/strategy/RimuHostingLifeCycleStrategy.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/strategy/RimuHostingLifeCycleStrategy.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/strategy/RimuHostingLifeCycleStrategy.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/strategy/RimuHostingLifeCycleStrategy.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/strategy/RimuHostingListNodesStrategy.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/strategy/RimuHostingListNodesStrategy.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/strategy/RimuHostingListNodesStrategy.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/strategy/RimuHostingListNodesStrategy.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/suppliers/RimuHostingDefaultLocationSupplier.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/suppliers/RimuHostingDefaultLocationSupplier.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/suppliers/RimuHostingDefaultLocationSupplier.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/suppliers/RimuHostingDefaultLocationSupplier.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/suppliers/RimuHostingHardwareSupplier.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/suppliers/RimuHostingHardwareSupplier.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/suppliers/RimuHostingHardwareSupplier.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/suppliers/RimuHostingHardwareSupplier.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/suppliers/RimuHostingImageSupplier.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/suppliers/RimuHostingImageSupplier.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/suppliers/RimuHostingImageSupplier.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/suppliers/RimuHostingImageSupplier.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/suppliers/RimuHostingLocationSupplier.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/suppliers/RimuHostingLocationSupplier.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/suppliers/RimuHostingLocationSupplier.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/suppliers/RimuHostingLocationSupplier.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/CloneOptions.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/CloneOptions.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/CloneOptions.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/CloneOptions.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/CreateOptions.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/CreateOptions.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/CreateOptions.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/CreateOptions.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/IpRequestData.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/IpRequestData.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/IpRequestData.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/IpRequestData.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/NewServerData.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/NewServerData.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/NewServerData.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/NewServerData.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/PostData.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/PostData.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/PostData.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/PostData.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/BillingData.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/BillingData.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/BillingData.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/BillingData.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/DataCenter.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/DataCenter.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/DataCenter.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/DataCenter.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/DataTransferAllowance.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/DataTransferAllowance.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/DataTransferAllowance.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/DataTransferAllowance.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/Image.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/Image.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/Image.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/Image.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/IpAddresses.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/IpAddresses.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/IpAddresses.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/IpAddresses.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/MetaData.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/MetaData.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/MetaData.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/MetaData.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/NewServerResponse.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/NewServerResponse.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/NewServerResponse.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/NewServerResponse.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/PricingPlan.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/PricingPlan.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/PricingPlan.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/PricingPlan.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ResizeResponse.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ResizeResponse.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ResizeResponse.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ResizeResponse.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ResizeResult.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ResizeResult.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ResizeResult.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ResizeResult.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/Server.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/Server.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/Server.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/Server.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ServerInfo.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ServerInfo.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ServerInfo.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ServerInfo.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ServerParameters.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ServerParameters.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ServerParameters.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ServerParameters.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/internal/RimuHostingError.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/internal/RimuHostingError.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/internal/RimuHostingError.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/internal/RimuHostingError.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/internal/RimuHostingResponse.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/internal/RimuHostingResponse.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/internal/RimuHostingResponse.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/internal/RimuHostingResponse.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/internal/RimuHostingTimestamp.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/internal/RimuHostingTimestamp.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/internal/RimuHostingTimestamp.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/internal/RimuHostingTimestamp.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/internal/RunningState.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/internal/RunningState.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/internal/RunningState.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/internal/RunningState.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/internal/ServerType.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/internal/ServerType.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/internal/ServerType.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/internal/ServerType.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/filters/RimuHostingAuthentication.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/filters/RimuHostingAuthentication.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/filters/RimuHostingAuthentication.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/filters/RimuHostingAuthentication.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseDestroyResponseFromJsonResponse.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseDestroyResponseFromJsonResponse.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseDestroyResponseFromJsonResponse.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseDestroyResponseFromJsonResponse.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseImagesFromJsonResponse.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseImagesFromJsonResponse.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseImagesFromJsonResponse.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseImagesFromJsonResponse.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParsePricingPlansFromJsonResponse.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParsePricingPlansFromJsonResponse.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParsePricingPlansFromJsonResponse.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParsePricingPlansFromJsonResponse.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseRimuHostingException.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseRimuHostingException.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseRimuHostingException.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseRimuHostingException.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseServerFromJsonResponse.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseServerFromJsonResponse.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseServerFromJsonResponse.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseServerFromJsonResponse.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseServerInfoFromJsonResponse.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseServerInfoFromJsonResponse.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseServerInfoFromJsonResponse.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseServerInfoFromJsonResponse.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseServersFromJsonResponse.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseServersFromJsonResponse.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseServersFromJsonResponse.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/functions/ParseServersFromJsonResponse.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/predicates/ServerDestroyed.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/predicates/ServerDestroyed.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/predicates/ServerDestroyed.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/predicates/ServerDestroyed.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/predicates/ServerRunning.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/predicates/ServerRunning.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/predicates/ServerRunning.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/predicates/ServerRunning.java
diff --git a/sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/reference/RimuHostingConstants.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/reference/RimuHostingConstants.java
similarity index 100%
rename from sandbox/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/reference/RimuHostingConstants.java
rename to sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/reference/RimuHostingConstants.java
diff --git a/sandbox/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/ProvidersInPropertiesTest.java b/sandbox-providers/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/ProvidersInPropertiesTest.java
similarity index 100%
rename from sandbox/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/ProvidersInPropertiesTest.java
rename to sandbox-providers/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/ProvidersInPropertiesTest.java
diff --git a/sandbox/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingAsyncClientTest.java b/sandbox-providers/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingAsyncClientTest.java
similarity index 100%
rename from sandbox/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingAsyncClientTest.java
rename to sandbox-providers/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingAsyncClientTest.java
diff --git a/sandbox/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingClientLiveTest.java b/sandbox-providers/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingClientLiveTest.java
similarity index 100%
rename from sandbox/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingClientLiveTest.java
rename to sandbox-providers/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingClientLiveTest.java
diff --git a/sandbox/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/RimuHostingComputeServiceLiveTest.java b/sandbox-providers/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/RimuHostingComputeServiceLiveTest.java
similarity index 100%
rename from sandbox/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/RimuHostingComputeServiceLiveTest.java
rename to sandbox-providers/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/RimuHostingComputeServiceLiveTest.java
diff --git a/sandbox/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/RimuHostingTemplateBuilderLiveTest.java b/sandbox-providers/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/RimuHostingTemplateBuilderLiveTest.java
similarity index 100%
rename from sandbox/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/RimuHostingTemplateBuilderLiveTest.java
rename to sandbox-providers/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/RimuHostingTemplateBuilderLiveTest.java
diff --git a/sandbox/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingComputeServiceContextModuleTest.java b/sandbox-providers/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingComputeServiceContextModuleTest.java
similarity index 100%
rename from sandbox/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingComputeServiceContextModuleTest.java
rename to sandbox-providers/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingComputeServiceContextModuleTest.java
diff --git a/sandbox/rimuhosting/src/test/resources/log4j.xml b/sandbox-providers/rimuhosting/src/test/resources/log4j.xml
similarity index 100%
rename from sandbox/rimuhosting/src/test/resources/log4j.xml
rename to sandbox-providers/rimuhosting/src/test/resources/log4j.xml
diff --git a/sandbox/savvis/pom.xml b/sandbox-providers/savvis/pom.xml
similarity index 100%
rename from sandbox/savvis/pom.xml
rename to sandbox-providers/savvis/pom.xml
diff --git a/sandbox/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCAsyncClient.java b/sandbox-providers/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCAsyncClient.java
similarity index 100%
rename from sandbox/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCAsyncClient.java
rename to sandbox-providers/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCAsyncClient.java
diff --git a/sandbox/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCClient.java b/sandbox-providers/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCClient.java
similarity index 100%
rename from sandbox/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCClient.java
rename to sandbox-providers/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCClient.java
diff --git a/sandbox/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCContextBuilder.java b/sandbox-providers/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCContextBuilder.java
similarity index 100%
rename from sandbox/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCContextBuilder.java
rename to sandbox-providers/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCContextBuilder.java
diff --git a/sandbox/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCPropertiesBuilder.java b/sandbox-providers/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCPropertiesBuilder.java
similarity index 100%
rename from sandbox/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCPropertiesBuilder.java
rename to sandbox-providers/savvis/src/main/java/org/jclouds/savvis/SymphonyVPDCPropertiesBuilder.java
diff --git a/sandbox/savvis/src/main/java/org/jclouds/savvis/compute/config/SymphonyVPDCComputeServiceContextModule.java b/sandbox-providers/savvis/src/main/java/org/jclouds/savvis/compute/config/SymphonyVPDCComputeServiceContextModule.java
similarity index 100%
rename from sandbox/savvis/src/main/java/org/jclouds/savvis/compute/config/SymphonyVPDCComputeServiceContextModule.java
rename to sandbox-providers/savvis/src/main/java/org/jclouds/savvis/compute/config/SymphonyVPDCComputeServiceContextModule.java
diff --git a/sandbox/savvis/src/main/java/org/jclouds/savvis/config/SymphonyVPDCRestClientModule.java b/sandbox-providers/savvis/src/main/java/org/jclouds/savvis/config/SymphonyVPDCRestClientModule.java
similarity index 100%
rename from sandbox/savvis/src/main/java/org/jclouds/savvis/config/SymphonyVPDCRestClientModule.java
rename to sandbox-providers/savvis/src/main/java/org/jclouds/savvis/config/SymphonyVPDCRestClientModule.java
diff --git a/sandbox/savvis/src/main/java/org/jclouds/savvis/handlers/SymphonyVPDCErrorHandler.java b/sandbox-providers/savvis/src/main/java/org/jclouds/savvis/handlers/SymphonyVPDCErrorHandler.java
similarity index 100%
rename from sandbox/savvis/src/main/java/org/jclouds/savvis/handlers/SymphonyVPDCErrorHandler.java
rename to sandbox-providers/savvis/src/main/java/org/jclouds/savvis/handlers/SymphonyVPDCErrorHandler.java
diff --git a/sandbox/savvis/src/test/java/org/jclouds/savvis/SymphonyVPDCAsyncClientTest.java b/sandbox-providers/savvis/src/test/java/org/jclouds/savvis/SymphonyVPDCAsyncClientTest.java
similarity index 100%
rename from sandbox/savvis/src/test/java/org/jclouds/savvis/SymphonyVPDCAsyncClientTest.java
rename to sandbox-providers/savvis/src/test/java/org/jclouds/savvis/SymphonyVPDCAsyncClientTest.java
diff --git a/sandbox/savvis/src/test/java/org/jclouds/savvis/SymphonyVPDCClientLiveTest.java b/sandbox-providers/savvis/src/test/java/org/jclouds/savvis/SymphonyVPDCClientLiveTest.java
similarity index 100%
rename from sandbox/savvis/src/test/java/org/jclouds/savvis/SymphonyVPDCClientLiveTest.java
rename to sandbox-providers/savvis/src/test/java/org/jclouds/savvis/SymphonyVPDCClientLiveTest.java
diff --git a/sandbox/savvis/src/test/java/org/jclouds/savvis/handlers/SymphonyVPDCErrorHandlerTest.java b/sandbox-providers/savvis/src/test/java/org/jclouds/savvis/handlers/SymphonyVPDCErrorHandlerTest.java
similarity index 100%
rename from sandbox/savvis/src/test/java/org/jclouds/savvis/handlers/SymphonyVPDCErrorHandlerTest.java
rename to sandbox-providers/savvis/src/test/java/org/jclouds/savvis/handlers/SymphonyVPDCErrorHandlerTest.java
diff --git a/sandbox/sdn/README.txt b/sandbox-providers/sdn/README.txt
similarity index 100%
rename from sandbox/sdn/README.txt
rename to sandbox-providers/sdn/README.txt
diff --git a/sandbox/sdn/pom.xml b/sandbox-providers/sdn/pom.xml
similarity index 100%
rename from sandbox/sdn/pom.xml
rename to sandbox-providers/sdn/pom.xml
diff --git a/sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/SDNAsyncClient.java b/sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/SDNAsyncClient.java
similarity index 100%
rename from sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/SDNAsyncClient.java
rename to sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/SDNAsyncClient.java
diff --git a/sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/SDNAuthAsyncClient.java b/sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/SDNAuthAsyncClient.java
similarity index 100%
rename from sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/SDNAuthAsyncClient.java
rename to sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/SDNAuthAsyncClient.java
diff --git a/sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/SDNClient.java b/sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/SDNClient.java
similarity index 100%
rename from sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/SDNClient.java
rename to sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/SDNClient.java
diff --git a/sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/SDNContextBuilder.java b/sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/SDNContextBuilder.java
similarity index 100%
rename from sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/SDNContextBuilder.java
rename to sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/SDNContextBuilder.java
diff --git a/sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/SDNPropertiesBuilder.java b/sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/SDNPropertiesBuilder.java
similarity index 100%
rename from sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/SDNPropertiesBuilder.java
rename to sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/SDNPropertiesBuilder.java
diff --git a/sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/SessionToken.java b/sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/SessionToken.java
similarity index 100%
rename from sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/SessionToken.java
rename to sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/SessionToken.java
diff --git a/sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/binders/BindMetadataToQueryParams.java b/sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/binders/BindMetadataToQueryParams.java
similarity index 100%
rename from sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/binders/BindMetadataToQueryParams.java
rename to sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/binders/BindMetadataToQueryParams.java
diff --git a/sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/config/SDNAuthRestClientModule.java b/sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/config/SDNAuthRestClientModule.java
similarity index 100%
rename from sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/config/SDNAuthRestClientModule.java
rename to sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/config/SDNAuthRestClientModule.java
diff --git a/sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/config/SDNRestClientModule.java b/sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/config/SDNRestClientModule.java
similarity index 100%
rename from sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/config/SDNRestClientModule.java
rename to sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/config/SDNRestClientModule.java
diff --git a/sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/domain/UploadInfo.java b/sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/domain/UploadInfo.java
similarity index 100%
rename from sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/domain/UploadInfo.java
rename to sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/domain/UploadInfo.java
diff --git a/sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/filters/AddSessionTokenToRequest.java b/sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/filters/AddSessionTokenToRequest.java
similarity index 100%
rename from sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/filters/AddSessionTokenToRequest.java
rename to sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/filters/AddSessionTokenToRequest.java
diff --git a/sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/filters/InsertUserContextIntoPath.java b/sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/filters/InsertUserContextIntoPath.java
similarity index 100%
rename from sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/filters/InsertUserContextIntoPath.java
rename to sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/filters/InsertUserContextIntoPath.java
diff --git a/sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseMetadataFromJsonResponse.java b/sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseMetadataFromJsonResponse.java
similarity index 100%
rename from sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseMetadataFromJsonResponse.java
rename to sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseMetadataFromJsonResponse.java
diff --git a/sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseSessionTokenFromJsonResponse.java b/sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseSessionTokenFromJsonResponse.java
similarity index 100%
rename from sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseSessionTokenFromJsonResponse.java
rename to sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseSessionTokenFromJsonResponse.java
diff --git a/sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseUploadInfoFromJsonResponse.java b/sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseUploadInfoFromJsonResponse.java
similarity index 100%
rename from sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseUploadInfoFromJsonResponse.java
rename to sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/functions/ParseUploadInfoFromJsonResponse.java
diff --git a/sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/reference/SDNConstants.java b/sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/reference/SDNConstants.java
similarity index 100%
rename from sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/reference/SDNConstants.java
rename to sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/reference/SDNConstants.java
diff --git a/sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/reference/SDNQueryParams.java b/sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/reference/SDNQueryParams.java
similarity index 100%
rename from sandbox/sdn/src/main/java/org/jclouds/nirvanix/sdn/reference/SDNQueryParams.java
rename to sandbox-providers/sdn/src/main/java/org/jclouds/nirvanix/sdn/reference/SDNQueryParams.java
diff --git a/sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/ProvidersInPropertiesTest.java b/sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/ProvidersInPropertiesTest.java
similarity index 100%
rename from sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/ProvidersInPropertiesTest.java
rename to sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/ProvidersInPropertiesTest.java
diff --git a/sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/SDNAsyncClientTest.java b/sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/SDNAsyncClientTest.java
similarity index 100%
rename from sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/SDNAsyncClientTest.java
rename to sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/SDNAsyncClientTest.java
diff --git a/sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/SDNAuthAsyncClientTest.java b/sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/SDNAuthAsyncClientTest.java
similarity index 100%
rename from sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/SDNAuthAsyncClientTest.java
rename to sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/SDNAuthAsyncClientTest.java
diff --git a/sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/SDNAuthenticationLiveTest.java b/sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/SDNAuthenticationLiveTest.java
similarity index 100%
rename from sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/SDNAuthenticationLiveTest.java
rename to sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/SDNAuthenticationLiveTest.java
diff --git a/sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/SDNClientLiveTest.java b/sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/SDNClientLiveTest.java
similarity index 100%
rename from sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/SDNClientLiveTest.java
rename to sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/SDNClientLiveTest.java
diff --git a/sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/binders/BindMetadataToQueryParamsTest.java b/sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/binders/BindMetadataToQueryParamsTest.java
similarity index 100%
rename from sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/binders/BindMetadataToQueryParamsTest.java
rename to sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/binders/BindMetadataToQueryParamsTest.java
diff --git a/sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/filters/AddSessionTokenToRequestTest.java b/sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/filters/AddSessionTokenToRequestTest.java
similarity index 100%
rename from sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/filters/AddSessionTokenToRequestTest.java
rename to sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/filters/AddSessionTokenToRequestTest.java
diff --git a/sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/filters/InsertUserContextIntoPathTest.java b/sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/filters/InsertUserContextIntoPathTest.java
similarity index 100%
rename from sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/filters/InsertUserContextIntoPathTest.java
rename to sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/filters/InsertUserContextIntoPathTest.java
diff --git a/sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseMetadataFromJsonResponseTest.java b/sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseMetadataFromJsonResponseTest.java
similarity index 100%
rename from sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseMetadataFromJsonResponseTest.java
rename to sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseMetadataFromJsonResponseTest.java
diff --git a/sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseSessionTokenFromJsonResponseTest.java b/sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseSessionTokenFromJsonResponseTest.java
similarity index 100%
rename from sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseSessionTokenFromJsonResponseTest.java
rename to sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseSessionTokenFromJsonResponseTest.java
diff --git a/sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseUploadInfoFromJsonResponseTest.java b/sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseUploadInfoFromJsonResponseTest.java
similarity index 100%
rename from sandbox/sdn/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseUploadInfoFromJsonResponseTest.java
rename to sandbox-providers/sdn/src/test/java/org/jclouds/nirvanix/sdn/functions/ParseUploadInfoFromJsonResponseTest.java
diff --git a/sandbox/sdn/src/test/resources/authtoken.json b/sandbox-providers/sdn/src/test/resources/authtoken.json
similarity index 100%
rename from sandbox/sdn/src/test/resources/authtoken.json
rename to sandbox-providers/sdn/src/test/resources/authtoken.json
diff --git a/sandbox/sdn/src/test/resources/log4j.xml b/sandbox-providers/sdn/src/test/resources/log4j.xml
similarity index 100%
rename from sandbox/sdn/src/test/resources/log4j.xml
rename to sandbox-providers/sdn/src/test/resources/log4j.xml
diff --git a/sandbox/sdn/src/test/resources/login.json b/sandbox-providers/sdn/src/test/resources/login.json
similarity index 100%
rename from sandbox/sdn/src/test/resources/login.json
rename to sandbox-providers/sdn/src/test/resources/login.json
diff --git a/sandbox/sdn/src/test/resources/metadata.json b/sandbox-providers/sdn/src/test/resources/metadata.json
similarity index 100%
rename from sandbox/sdn/src/test/resources/metadata.json
rename to sandbox-providers/sdn/src/test/resources/metadata.json
diff --git a/sandbox/twitter/.gitignore b/sandbox-providers/twitter/.gitignore
similarity index 100%
rename from sandbox/twitter/.gitignore
rename to sandbox-providers/twitter/.gitignore
diff --git a/sandbox/twitter/README.txt b/sandbox-providers/twitter/README.txt
similarity index 100%
rename from sandbox/twitter/README.txt
rename to sandbox-providers/twitter/README.txt
diff --git a/sandbox/twitter/pom.xml b/sandbox-providers/twitter/pom.xml
similarity index 100%
rename from sandbox/twitter/pom.xml
rename to sandbox-providers/twitter/pom.xml
diff --git a/sandbox/twitter/src/main/java/org/jclouds/twitter/Twitter.java b/sandbox-providers/twitter/src/main/java/org/jclouds/twitter/Twitter.java
similarity index 100%
rename from sandbox/twitter/src/main/java/org/jclouds/twitter/Twitter.java
rename to sandbox-providers/twitter/src/main/java/org/jclouds/twitter/Twitter.java
diff --git a/sandbox/twitter/src/main/java/org/jclouds/twitter/TwitterAsyncClient.java b/sandbox-providers/twitter/src/main/java/org/jclouds/twitter/TwitterAsyncClient.java
similarity index 100%
rename from sandbox/twitter/src/main/java/org/jclouds/twitter/TwitterAsyncClient.java
rename to sandbox-providers/twitter/src/main/java/org/jclouds/twitter/TwitterAsyncClient.java
diff --git a/sandbox/twitter/src/main/java/org/jclouds/twitter/TwitterClient.java b/sandbox-providers/twitter/src/main/java/org/jclouds/twitter/TwitterClient.java
similarity index 100%
rename from sandbox/twitter/src/main/java/org/jclouds/twitter/TwitterClient.java
rename to sandbox-providers/twitter/src/main/java/org/jclouds/twitter/TwitterClient.java
diff --git a/sandbox/twitter/src/main/java/org/jclouds/twitter/TwitterContextBuilder.java b/sandbox-providers/twitter/src/main/java/org/jclouds/twitter/TwitterContextBuilder.java
similarity index 100%
rename from sandbox/twitter/src/main/java/org/jclouds/twitter/TwitterContextBuilder.java
rename to sandbox-providers/twitter/src/main/java/org/jclouds/twitter/TwitterContextBuilder.java
diff --git a/sandbox/twitter/src/main/java/org/jclouds/twitter/TwitterPropertiesBuilder.java b/sandbox-providers/twitter/src/main/java/org/jclouds/twitter/TwitterPropertiesBuilder.java
similarity index 100%
rename from sandbox/twitter/src/main/java/org/jclouds/twitter/TwitterPropertiesBuilder.java
rename to sandbox-providers/twitter/src/main/java/org/jclouds/twitter/TwitterPropertiesBuilder.java
diff --git a/sandbox/twitter/src/main/java/org/jclouds/twitter/config/TwitterRestClientModule.java b/sandbox-providers/twitter/src/main/java/org/jclouds/twitter/config/TwitterRestClientModule.java
similarity index 100%
rename from sandbox/twitter/src/main/java/org/jclouds/twitter/config/TwitterRestClientModule.java
rename to sandbox-providers/twitter/src/main/java/org/jclouds/twitter/config/TwitterRestClientModule.java
diff --git a/sandbox/twitter/src/main/java/org/jclouds/twitter/domain/Status.java b/sandbox-providers/twitter/src/main/java/org/jclouds/twitter/domain/Status.java
similarity index 100%
rename from sandbox/twitter/src/main/java/org/jclouds/twitter/domain/Status.java
rename to sandbox-providers/twitter/src/main/java/org/jclouds/twitter/domain/Status.java
diff --git a/sandbox/twitter/src/main/java/org/jclouds/twitter/domain/User.java b/sandbox-providers/twitter/src/main/java/org/jclouds/twitter/domain/User.java
similarity index 100%
rename from sandbox/twitter/src/main/java/org/jclouds/twitter/domain/User.java
rename to sandbox-providers/twitter/src/main/java/org/jclouds/twitter/domain/User.java
diff --git a/sandbox/twitter/src/test/java/org/jclouds/twitter/TwitterAsyncClientTest.java b/sandbox-providers/twitter/src/test/java/org/jclouds/twitter/TwitterAsyncClientTest.java
similarity index 100%
rename from sandbox/twitter/src/test/java/org/jclouds/twitter/TwitterAsyncClientTest.java
rename to sandbox-providers/twitter/src/test/java/org/jclouds/twitter/TwitterAsyncClientTest.java
diff --git a/sandbox/twitter/src/test/java/org/jclouds/twitter/TwitterClientLiveTest.java b/sandbox-providers/twitter/src/test/java/org/jclouds/twitter/TwitterClientLiveTest.java
similarity index 100%
rename from sandbox/twitter/src/test/java/org/jclouds/twitter/TwitterClientLiveTest.java
rename to sandbox-providers/twitter/src/test/java/org/jclouds/twitter/TwitterClientLiveTest.java
diff --git a/sandbox/twitter/src/test/resources/log4j.xml b/sandbox-providers/twitter/src/test/resources/log4j.xml
similarity index 100%
rename from sandbox/twitter/src/test/resources/log4j.xml
rename to sandbox-providers/twitter/src/test/resources/log4j.xml
diff --git a/sandbox/twitter/src/test/resources/test_mentions.json b/sandbox-providers/twitter/src/test/resources/test_mentions.json
similarity index 100%
rename from sandbox/twitter/src/test/resources/test_mentions.json
rename to sandbox-providers/twitter/src/test/resources/test_mentions.json