diff --git a/README.txt b/README.txt
index f94aa85b7f..5b08440d21 100644
--- a/README.txt
+++ b/README.txt
@@ -21,7 +21,7 @@ our compute api supports: aws-ec2, gogrid, cloudservers-us, stub (in-memory), de
slicehost, eucalyptus-partnercloud-ec2, elastichosts-lon-p (Peer 1),
elastichosts-sat-p (Peer 1), elastichosts-lon-b (BlueSquare),
openhosting-east1, serverlove-z1-man, skalicloud-sdg-my,
- greenhousedata-element-vcloud
+ greenhousedata-element-vcloud, softlayer
* note * the pom dependency org.jclouds/jclouds-allcompute gives you access to
to all of these providers
diff --git a/allcompute/pom.xml b/allcompute/pom.xml
index 2b50cd51e5..ce2746b993 100644
--- a/allcompute/pom.xml
+++ b/allcompute/pom.xml
@@ -170,5 +170,10 @@
go2cloud-jhb1
${project.version}
+
+ org.jclouds.provider
+ softlayer
+ ${project.version}
+
diff --git a/providers/pom.xml b/providers/pom.xml
index 2c6d04fde1..9f86e2a442 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -63,5 +63,6 @@
greenhousedata-element-vcloud
aws-cloudwatch
go2cloud-jhb1
+ softlayer
diff --git a/sandbox-providers/softlayer/pom.xml b/providers/softlayer/pom.xml
similarity index 100%
rename from sandbox-providers/softlayer/pom.xml
rename to providers/softlayer/pom.xml
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerAsyncClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerAsyncClient.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerAsyncClient.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerAsyncClient.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerClient.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerClient.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerClient.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerContextBuilder.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerContextBuilder.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerContextBuilder.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerContextBuilder.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerPropertiesBuilder.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerPropertiesBuilder.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerPropertiesBuilder.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerPropertiesBuilder.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/binders/ProductOrderToJson.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/ProductOrderToJson.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/binders/ProductOrderToJson.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/binders/ProductOrderToJson.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/DatacenterToLocation.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/DatacenterToLocation.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/DatacenterToLocation.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/DatacenterToLocation.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItemToImage.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItemToImage.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItemToImage.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItemToImage.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItems.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItems.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItems.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItems.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardware.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardware.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardware.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardware.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptions.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptions.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptions.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptions.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/config/SoftLayerParserModule.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/config/SoftLayerParserModule.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/config/SoftLayerParserModule.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/config/SoftLayerParserModule.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/config/SoftLayerRestClientModule.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/config/SoftLayerRestClientModule.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/config/SoftLayerRestClientModule.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/config/SoftLayerRestClientModule.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Password.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Password.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Password.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Password.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/PowerState.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/PowerState.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/PowerState.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/domain/PowerState.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemCategory.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemCategory.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemCategory.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemCategory.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductOrder.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductOrder.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductOrder.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductOrder.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductOrderReceipt.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductOrderReceipt.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductOrderReceipt.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductOrderReceipt.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductPackage.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductPackage.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductPackage.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductPackage.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountAsyncClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountAsyncClient.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountAsyncClient.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountAsyncClient.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountClient.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountClient.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountClient.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterAsyncClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterAsyncClient.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterAsyncClient.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterAsyncClient.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterClient.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterClient.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterClient.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageAsyncClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageAsyncClient.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageAsyncClient.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageAsyncClient.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageClient.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageClient.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageClient.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestAsyncClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestAsyncClient.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestAsyncClient.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestAsyncClient.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestClient.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestClient.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestClient.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/handlers/SoftLayerErrorHandler.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/handlers/SoftLayerErrorHandler.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/handlers/SoftLayerErrorHandler.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/handlers/SoftLayerErrorHandler.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/predicates/ProductItemPredicates.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/predicates/ProductItemPredicates.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/predicates/ProductItemPredicates.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/predicates/ProductItemPredicates.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/predicates/ProductPackagePredicates.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/predicates/ProductPackagePredicates.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/predicates/ProductPackagePredicates.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/predicates/ProductPackagePredicates.java
diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/reference/SoftLayerConstants.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/reference/SoftLayerConstants.java
similarity index 100%
rename from sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/reference/SoftLayerConstants.java
rename to providers/softlayer/src/main/java/org/jclouds/softlayer/reference/SoftLayerConstants.java
diff --git a/sandbox-providers/softlayer/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/softlayer/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
similarity index 100%
rename from sandbox-providers/softlayer/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
rename to providers/softlayer/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/SoftLayerAsyncClientTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/SoftLayerAsyncClientTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/SoftLayerAsyncClientTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/SoftLayerAsyncClientTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/SoftLayerErrorHandlerTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/SoftLayerErrorHandlerTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/SoftLayerErrorHandlerTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/SoftLayerErrorHandlerTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/SoftLayerProviderTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/SoftLayerProviderTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/SoftLayerProviderTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/SoftLayerProviderTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/binders/ProductOrderToJsonTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/binders/ProductOrderToJsonTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/binders/ProductOrderToJsonTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/binders/ProductOrderToJsonTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceAdapterLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceAdapterLiveTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceAdapterLiveTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceAdapterLiveTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceLiveTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceLiveTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceLiveTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerExperimentLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerExperimentLiveTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerExperimentLiveTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerExperimentLiveTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/DatacenterToLocationTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/DatacenterToLocationTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/DatacenterToLocationTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/DatacenterToLocationTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemToImageTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemToImageTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemToImageTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemToImageTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardwareTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardwareTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardwareTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardwareTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadataTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadataTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadataTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadataTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptionsTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptionsTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptionsTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptionsTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/domain/AddressTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/domain/AddressTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/domain/AddressTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/domain/AddressTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountAsyncClientTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountAsyncClientTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountAsyncClientTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountAsyncClientTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountClientLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountClientLiveTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountClientLiveTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountClientLiveTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/features/BaseSoftLayerAsyncClientTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/BaseSoftLayerAsyncClientTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/features/BaseSoftLayerAsyncClientTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/features/BaseSoftLayerAsyncClientTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/features/BaseSoftLayerClientLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/BaseSoftLayerClientLiveTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/features/BaseSoftLayerClientLiveTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/features/BaseSoftLayerClientLiveTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterAsyncClientTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterAsyncClientTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterAsyncClientTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterAsyncClientTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterClientLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterClientLiveTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterClientLiveTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterClientLiveTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/features/ProductPackageAsyncClientTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/ProductPackageAsyncClientTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/features/ProductPackageAsyncClientTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/features/ProductPackageAsyncClientTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/features/ProductPackageClientLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/ProductPackageClientLiveTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/features/ProductPackageClientLiveTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/features/ProductPackageClientLiveTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestAsyncClientTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestAsyncClientTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestAsyncClientTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestAsyncClientTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestClientLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestClientLiveTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestClientLiveTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestClientLiveTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseBadVirtualGuest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseBadVirtualGuest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseBadVirtualGuest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseBadVirtualGuest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseProductOrderTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseProductOrderTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseProductOrderTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseProductOrderTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestHaltedTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestHaltedTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestHaltedTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestHaltedTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestPausedTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestPausedTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestPausedTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestPausedTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestRunningTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestRunningTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestRunningTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestRunningTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestWithNoPasswordTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestWithNoPasswordTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestWithNoPasswordTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestWithNoPasswordTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/predicates/ProductItemPredicatesTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/predicates/ProductItemPredicatesTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/predicates/ProductItemPredicatesTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/predicates/ProductItemPredicatesTest.java
diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/predicates/ProductPackagePredicatesTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/predicates/ProductPackagePredicatesTest.java
similarity index 100%
rename from sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/predicates/ProductPackagePredicatesTest.java
rename to providers/softlayer/src/test/java/org/jclouds/softlayer/predicates/ProductPackagePredicatesTest.java
diff --git a/sandbox-providers/softlayer/src/test/resources/log4j.xml b/providers/softlayer/src/test/resources/log4j.xml
similarity index 100%
rename from sandbox-providers/softlayer/src/test/resources/log4j.xml
rename to providers/softlayer/src/test/resources/log4j.xml
diff --git a/sandbox-providers/softlayer/src/test/resources/product_order_template.json b/providers/softlayer/src/test/resources/product_order_template.json
similarity index 100%
rename from sandbox-providers/softlayer/src/test/resources/product_order_template.json
rename to providers/softlayer/src/test/resources/product_order_template.json
diff --git a/sandbox-providers/softlayer/src/test/resources/virtual_guest_bad_halted.json b/providers/softlayer/src/test/resources/virtual_guest_bad_halted.json
similarity index 100%
rename from sandbox-providers/softlayer/src/test/resources/virtual_guest_bad_halted.json
rename to providers/softlayer/src/test/resources/virtual_guest_bad_halted.json
diff --git a/sandbox-providers/softlayer/src/test/resources/virtual_guest_good_halted.json b/providers/softlayer/src/test/resources/virtual_guest_good_halted.json
similarity index 100%
rename from sandbox-providers/softlayer/src/test/resources/virtual_guest_good_halted.json
rename to providers/softlayer/src/test/resources/virtual_guest_good_halted.json
diff --git a/sandbox-providers/softlayer/src/test/resources/virtual_guest_no_password.json b/providers/softlayer/src/test/resources/virtual_guest_no_password.json
similarity index 100%
rename from sandbox-providers/softlayer/src/test/resources/virtual_guest_no_password.json
rename to providers/softlayer/src/test/resources/virtual_guest_no_password.json
diff --git a/sandbox-providers/softlayer/src/test/resources/virtual_guest_paused.json b/providers/softlayer/src/test/resources/virtual_guest_paused.json
similarity index 100%
rename from sandbox-providers/softlayer/src/test/resources/virtual_guest_paused.json
rename to providers/softlayer/src/test/resources/virtual_guest_paused.json
diff --git a/sandbox-providers/softlayer/src/test/resources/virtual_guest_running.json b/providers/softlayer/src/test/resources/virtual_guest_running.json
similarity index 100%
rename from sandbox-providers/softlayer/src/test/resources/virtual_guest_running.json
rename to providers/softlayer/src/test/resources/virtual_guest_running.json