diff --git a/allcompute/pom.xml b/allcompute/pom.xml
index c85d39c49e..ef067ac0a3 100644
--- a/allcompute/pom.xml
+++ b/allcompute/pom.xml
@@ -60,8 +60,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-slicehost</artifactId>
+            <groupId>org.jclouds.provider</groupId>
+            <artifactId>slicehost</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 8b7f6ed5e2..c6677e69e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,6 @@
         <module>azure</module>
         <module>atmos</module>
         <module>rackspace</module>
-        <module>slicehost</module>
         <module>vcloud</module>
         <module>elasticstack</module>
         <module>allcompute</module>
diff --git a/providers/pom.xml b/providers/pom.xml
index 6fe1af655a..af8b61dd27 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -34,6 +34,7 @@
     <name>jclouds providers project</name>
     <modules>
         <module>gogrid</module>
+        <module>slicehost</module>
         <module>cloudsigma</module>
     </modules>
 </project>
diff --git a/slicehost/pom.xml b/providers/slicehost/pom.xml
similarity index 90%
rename from slicehost/pom.xml
rename to providers/slicehost/pom.xml
index b048dd7c46..bf945b657d 100644
--- a/slicehost/pom.xml
+++ b/providers/slicehost/pom.xml
@@ -23,13 +23,14 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jclouds</groupId>
-        <artifactId>jclouds-project</artifactId>
+        <groupId>org.jclouds.provider</groupId>
+        <artifactId>jclouds-providers-project</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../project/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>jclouds-slicehost</artifactId>
-    <name>jclouds slicehost components</name>
+    <artifactId>slicehost</artifactId>
+    <name>jclouds Slicehost provider</name>
+    <description>ComputeService implementation of Slicehost datacenters</description>
     <properties>
         <!-- when instances are hung, open a ticket and add here -->
         <jclouds.compute.blacklist-nodes>trmkrun-ccc,test.trmk-924</jclouds.compute.blacklist-nodes>
@@ -39,19 +40,19 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
@@ -64,13 +65,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.jclouds</groupId>
             <artifactId>jclouds-log4j</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.jclouds</groupId>
             <artifactId>jclouds-jsch</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/SlicehostAsyncClient.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostAsyncClient.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/SlicehostAsyncClient.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostAsyncClient.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/SlicehostClient.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostClient.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/SlicehostClient.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostClient.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/SlicehostContextBuilder.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostContextBuilder.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/SlicehostContextBuilder.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostContextBuilder.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/SlicehostPropertiesBuilder.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostPropertiesBuilder.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/SlicehostPropertiesBuilder.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostPropertiesBuilder.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/binders/BindCreateBackupToXmlPayload.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/binders/BindCreateBackupToXmlPayload.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/binders/BindCreateBackupToXmlPayload.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/binders/BindCreateBackupToXmlPayload.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/binders/BindCreateSliceToXmlPayload.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/binders/BindCreateSliceToXmlPayload.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/binders/BindCreateSliceToXmlPayload.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/binders/BindCreateSliceToXmlPayload.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostBindComputeStrategiesByClass.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostBindComputeStrategiesByClass.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostBindComputeStrategiesByClass.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostBindComputeStrategiesByClass.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostBindComputeSuppliersByClass.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostBindComputeSuppliersByClass.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostBindComputeSuppliersByClass.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostBindComputeSuppliersByClass.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModule.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModule.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModule.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModule.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceDependenciesModule.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceDependenciesModule.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceDependenciesModule.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceDependenciesModule.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/FlavorToHardware.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/FlavorToHardware.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/compute/functions/FlavorToHardware.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/FlavorToHardware.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SliceToNodeMetadata.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SliceToNodeMetadata.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SliceToNodeMetadata.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SliceToNodeMetadata.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImage.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImage.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImage.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImage.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToOperatingSystem.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToOperatingSystem.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToOperatingSystem.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToOperatingSystem.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostAddNodeWithTagStrategy.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostAddNodeWithTagStrategy.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostAddNodeWithTagStrategy.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostAddNodeWithTagStrategy.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostDestroyNodeStrategy.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostDestroyNodeStrategy.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostDestroyNodeStrategy.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostDestroyNodeStrategy.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostGetNodeMetadataStrategy.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostGetNodeMetadataStrategy.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostGetNodeMetadataStrategy.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostGetNodeMetadataStrategy.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostLifeCycleStrategy.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostLifeCycleStrategy.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostLifeCycleStrategy.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostLifeCycleStrategy.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostListNodesStrategy.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostListNodesStrategy.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostListNodesStrategy.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/strategy/SlicehostListNodesStrategy.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/suppliers/SlicehostHardwareSupplier.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/suppliers/SlicehostHardwareSupplier.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/compute/suppliers/SlicehostHardwareSupplier.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/suppliers/SlicehostHardwareSupplier.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/suppliers/SlicehostImageSupplier.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/compute/suppliers/SlicehostImageSupplier.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/compute/suppliers/SlicehostImageSupplier.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/compute/suppliers/SlicehostImageSupplier.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/config/SlicehostRestClientModule.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/config/SlicehostRestClientModule.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/config/SlicehostRestClientModule.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/config/SlicehostRestClientModule.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/domain/Backup.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/domain/Backup.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/domain/Backup.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/domain/Backup.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/domain/Flavor.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/domain/Flavor.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/domain/Flavor.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/domain/Flavor.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/domain/Image.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/domain/Image.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/domain/Image.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/domain/Image.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/domain/Slice.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/domain/Slice.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/domain/Slice.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/domain/Slice.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/filters/SlicehostBasic.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/filters/SlicehostBasic.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/filters/SlicehostBasic.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/filters/SlicehostBasic.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/handlers/ParseSlicehostErrorFromHttpResponse.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/handlers/ParseSlicehostErrorFromHttpResponse.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/handlers/ParseSlicehostErrorFromHttpResponse.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/handlers/ParseSlicehostErrorFromHttpResponse.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/predicates/SliceActive.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/predicates/SliceActive.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/predicates/SliceActive.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/predicates/SliceActive.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/predicates/SliceTerminated.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/predicates/SliceTerminated.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/predicates/SliceTerminated.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/predicates/SliceTerminated.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/xml/BackupHandler.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/BackupHandler.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/xml/BackupHandler.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/xml/BackupHandler.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/xml/BackupsHandler.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/BackupsHandler.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/xml/BackupsHandler.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/xml/BackupsHandler.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/xml/ErrorHandler.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/ErrorHandler.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/xml/ErrorHandler.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/xml/ErrorHandler.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/xml/FlavorHandler.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/FlavorHandler.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/xml/FlavorHandler.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/xml/FlavorHandler.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/xml/FlavorsHandler.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/FlavorsHandler.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/xml/FlavorsHandler.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/xml/FlavorsHandler.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/xml/ImageHandler.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/ImageHandler.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/xml/ImageHandler.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/xml/ImageHandler.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/xml/ImagesHandler.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/ImagesHandler.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/xml/ImagesHandler.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/xml/ImagesHandler.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/xml/SliceHandler.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/SliceHandler.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/xml/SliceHandler.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/xml/SliceHandler.java
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/xml/SlicesHandler.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/SlicesHandler.java
similarity index 100%
rename from slicehost/src/main/java/org/jclouds/slicehost/xml/SlicesHandler.java
rename to providers/slicehost/src/main/java/org/jclouds/slicehost/xml/SlicesHandler.java
diff --git a/slicehost/src/test/java/org/jclouds/slicehost/ProvidersInPropertiesTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/ProvidersInPropertiesTest.java
similarity index 100%
rename from slicehost/src/test/java/org/jclouds/slicehost/ProvidersInPropertiesTest.java
rename to providers/slicehost/src/test/java/org/jclouds/slicehost/ProvidersInPropertiesTest.java
diff --git a/slicehost/src/test/java/org/jclouds/slicehost/SlicehostAsyncClientTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/SlicehostAsyncClientTest.java
similarity index 100%
rename from slicehost/src/test/java/org/jclouds/slicehost/SlicehostAsyncClientTest.java
rename to providers/slicehost/src/test/java/org/jclouds/slicehost/SlicehostAsyncClientTest.java
diff --git a/slicehost/src/test/java/org/jclouds/slicehost/SlicehostClientLiveTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/SlicehostClientLiveTest.java
similarity index 100%
rename from slicehost/src/test/java/org/jclouds/slicehost/SlicehostClientLiveTest.java
rename to providers/slicehost/src/test/java/org/jclouds/slicehost/SlicehostClientLiveTest.java
diff --git a/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostComputeServiceLiveTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostComputeServiceLiveTest.java
similarity index 100%
rename from slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostComputeServiceLiveTest.java
rename to providers/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostComputeServiceLiveTest.java
diff --git a/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostTemplateBuilderLiveTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostTemplateBuilderLiveTest.java
similarity index 100%
rename from slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostTemplateBuilderLiveTest.java
rename to providers/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostTemplateBuilderLiveTest.java
diff --git a/slicehost/src/test/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModuleTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModuleTest.java
similarity index 100%
rename from slicehost/src/test/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModuleTest.java
rename to providers/slicehost/src/test/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModuleTest.java
diff --git a/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/FlavorToHardwareTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/FlavorToHardwareTest.java
similarity index 100%
rename from slicehost/src/test/java/org/jclouds/slicehost/compute/functions/FlavorToHardwareTest.java
rename to providers/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/FlavorToHardwareTest.java
diff --git a/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/SliceToNodeMetadataTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/SliceToNodeMetadataTest.java
similarity index 100%
rename from slicehost/src/test/java/org/jclouds/slicehost/compute/functions/SliceToNodeMetadataTest.java
rename to providers/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/SliceToNodeMetadataTest.java
diff --git a/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImageTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImageTest.java
similarity index 100%
rename from slicehost/src/test/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImageTest.java
rename to providers/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImageTest.java
diff --git a/slicehost/src/test/java/org/jclouds/slicehost/xml/FlavorHandlerTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/xml/FlavorHandlerTest.java
similarity index 100%
rename from slicehost/src/test/java/org/jclouds/slicehost/xml/FlavorHandlerTest.java
rename to providers/slicehost/src/test/java/org/jclouds/slicehost/xml/FlavorHandlerTest.java
diff --git a/slicehost/src/test/java/org/jclouds/slicehost/xml/FlavorsHandlerTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/xml/FlavorsHandlerTest.java
similarity index 100%
rename from slicehost/src/test/java/org/jclouds/slicehost/xml/FlavorsHandlerTest.java
rename to providers/slicehost/src/test/java/org/jclouds/slicehost/xml/FlavorsHandlerTest.java
diff --git a/slicehost/src/test/java/org/jclouds/slicehost/xml/ImageHandlerTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/xml/ImageHandlerTest.java
similarity index 100%
rename from slicehost/src/test/java/org/jclouds/slicehost/xml/ImageHandlerTest.java
rename to providers/slicehost/src/test/java/org/jclouds/slicehost/xml/ImageHandlerTest.java
diff --git a/slicehost/src/test/java/org/jclouds/slicehost/xml/ImagesHandlerTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/xml/ImagesHandlerTest.java
similarity index 100%
rename from slicehost/src/test/java/org/jclouds/slicehost/xml/ImagesHandlerTest.java
rename to providers/slicehost/src/test/java/org/jclouds/slicehost/xml/ImagesHandlerTest.java
diff --git a/slicehost/src/test/java/org/jclouds/slicehost/xml/SliceHandlerTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/xml/SliceHandlerTest.java
similarity index 100%
rename from slicehost/src/test/java/org/jclouds/slicehost/xml/SliceHandlerTest.java
rename to providers/slicehost/src/test/java/org/jclouds/slicehost/xml/SliceHandlerTest.java
diff --git a/slicehost/src/test/java/org/jclouds/slicehost/xml/SlicesHandlerTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/xml/SlicesHandlerTest.java
similarity index 100%
rename from slicehost/src/test/java/org/jclouds/slicehost/xml/SlicesHandlerTest.java
rename to providers/slicehost/src/test/java/org/jclouds/slicehost/xml/SlicesHandlerTest.java
diff --git a/slicehost/src/test/resources/log4j.xml b/providers/slicehost/src/test/resources/log4j.xml
similarity index 100%
rename from slicehost/src/test/resources/log4j.xml
rename to providers/slicehost/src/test/resources/log4j.xml
diff --git a/slicehost/src/test/resources/test_errors.xml b/providers/slicehost/src/test/resources/test_errors.xml
similarity index 100%
rename from slicehost/src/test/resources/test_errors.xml
rename to providers/slicehost/src/test/resources/test_errors.xml
diff --git a/slicehost/src/test/resources/test_get_flavor.xml b/providers/slicehost/src/test/resources/test_get_flavor.xml
similarity index 100%
rename from slicehost/src/test/resources/test_get_flavor.xml
rename to providers/slicehost/src/test/resources/test_get_flavor.xml
diff --git a/slicehost/src/test/resources/test_get_image.xml b/providers/slicehost/src/test/resources/test_get_image.xml
similarity index 100%
rename from slicehost/src/test/resources/test_get_image.xml
rename to providers/slicehost/src/test/resources/test_get_image.xml
diff --git a/slicehost/src/test/resources/test_get_image32.xml b/providers/slicehost/src/test/resources/test_get_image32.xml
similarity index 100%
rename from slicehost/src/test/resources/test_get_image32.xml
rename to providers/slicehost/src/test/resources/test_get_image32.xml
diff --git a/slicehost/src/test/resources/test_get_slice.xml b/providers/slicehost/src/test/resources/test_get_slice.xml
similarity index 100%
rename from slicehost/src/test/resources/test_get_slice.xml
rename to providers/slicehost/src/test/resources/test_get_slice.xml
diff --git a/slicehost/src/test/resources/test_list_flavors.xml b/providers/slicehost/src/test/resources/test_list_flavors.xml
similarity index 100%
rename from slicehost/src/test/resources/test_list_flavors.xml
rename to providers/slicehost/src/test/resources/test_list_flavors.xml
diff --git a/slicehost/src/test/resources/test_list_images.xml b/providers/slicehost/src/test/resources/test_list_images.xml
similarity index 100%
rename from slicehost/src/test/resources/test_list_images.xml
rename to providers/slicehost/src/test/resources/test_list_images.xml
diff --git a/slicehost/src/test/resources/test_list_slices.xml b/providers/slicehost/src/test/resources/test_list_slices.xml
similarity index 100%
rename from slicehost/src/test/resources/test_list_slices.xml
rename to providers/slicehost/src/test/resources/test_list_slices.xml
diff --git a/slicehost/src/test/resources/test_new_slice.xml b/providers/slicehost/src/test/resources/test_new_slice.xml
similarity index 100%
rename from slicehost/src/test/resources/test_new_slice.xml
rename to providers/slicehost/src/test/resources/test_new_slice.xml