diff --git a/allcompute/pom.xml b/allcompute/pom.xml
index 3d4e4dfb54..2e554d5db0 100644
--- a/allcompute/pom.xml
+++ b/allcompute/pom.xml
@@ -75,8 +75,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-cloudsigma</artifactId>
+            <groupId>org.jclouds.provider</groupId>
+            <artifactId>cloudsigma</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index 416e11f1a6..ddb0cfb187 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,6 @@
         <module>vcloud</module>
         <module>gogrid</module>
         <module>elasticstack</module>
-        <module>cloudsigma</module>
         <module>allcompute</module>
         <module>allblobstore</module>
         <module>all</module>
diff --git a/cloudsigma/pom.xml b/providers/cloudsigma/pom.xml
similarity index 82%
rename from cloudsigma/pom.xml
rename to providers/cloudsigma/pom.xml
index d920f70eac..a7cd9070fd 100644
--- a/cloudsigma/pom.xml
+++ b/providers/cloudsigma/pom.xml
@@ -25,30 +25,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <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>
-    <groupId>org.jclouds</groupId>
-    <artifactId>jclouds-cloudsigma</artifactId>
-    <name>jclouds cloudsigma core</name>
-    <description>jclouds components to access cloudsigma</description>
-    
-    <!-- bootstrapping: need to fetch the project POM -->
-    <repositories>
-        <repository>
-            <id>jclouds-googlecode-deploy</id>
-            <url>http://jclouds.googlecode.com/svn/repo</url>
-        </repository>
-        <repository>
-            <id>jclouds-rimu-snapshots-nexus</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>    
-    </repositories>
+    <artifactId>cloudsigma</artifactId>
+    <name>jclouds CloudSigma provider</name>
+    <description>ComputeService binding to the CloudSigma datacenter in Zürich</description>
     
     <properties>
         <!-- when instances are hung, open a ticket and add here -->
@@ -58,34 +42,35 @@
         <test.cloudsigma.identity>FIXME</test.cloudsigma.identity>
         <test.cloudsigma.credential>FIXME</test.cloudsigma.credential>
     </properties>
+
     <dependencies>
         <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-jsch</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <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-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>
             <type>test-jar</type>
@@ -98,7 +83,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.jclouds</groupId>
             <artifactId>jclouds-log4j</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaAsyncClient.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaAsyncClient.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaAsyncClient.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaAsyncClient.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaClient.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaClient.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaClient.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaClient.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaContextBuilder.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaContextBuilder.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaContextBuilder.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaContextBuilder.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaPropertiesBuilder.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaPropertiesBuilder.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaPropertiesBuilder.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaPropertiesBuilder.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/binders/BindCloneDriveOptionsToPlainTextString.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/binders/BindCloneDriveOptionsToPlainTextString.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/binders/BindCloneDriveOptionsToPlainTextString.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/binders/BindCloneDriveOptionsToPlainTextString.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/binders/BindDriveDataToPlainTextString.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/binders/BindDriveDataToPlainTextString.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/binders/BindDriveDataToPlainTextString.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/binders/BindDriveDataToPlainTextString.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/binders/BindDriveToPlainTextString.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/binders/BindDriveToPlainTextString.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/binders/BindDriveToPlainTextString.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/binders/BindDriveToPlainTextString.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/binders/BindServerToPlainTextString.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/binders/BindServerToPlainTextString.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/binders/BindServerToPlainTextString.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/binders/BindServerToPlainTextString.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/CloudSigmaComputeServiceAdapter.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/CloudSigmaComputeServiceAdapter.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/CloudSigmaComputeServiceAdapter.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/CloudSigmaComputeServiceAdapter.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/config/CloudSigmaComputeServiceContextModule.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/config/CloudSigmaComputeServiceContextModule.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/config/CloudSigmaComputeServiceContextModule.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/config/CloudSigmaComputeServiceContextModule.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/functions/ParseOsFamilyVersion64BitFromImageName.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/functions/ParseOsFamilyVersion64BitFromImageName.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/functions/ParseOsFamilyVersion64BitFromImageName.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/functions/ParseOsFamilyVersion64BitFromImageName.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/functions/PreinstalledDiskToImage.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/functions/PreinstalledDiskToImage.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/functions/PreinstalledDiskToImage.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/functions/PreinstalledDiskToImage.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/functions/ServerInfoToNodeMetadata.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/functions/ServerInfoToNodeMetadata.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/functions/ServerInfoToNodeMetadata.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/functions/ServerInfoToNodeMetadata.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/config/CloudSigmaRestClientModule.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/config/CloudSigmaRestClientModule.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/config/CloudSigmaRestClientModule.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/config/CloudSigmaRestClientModule.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/BlockDevice.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/BlockDevice.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/BlockDevice.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/BlockDevice.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/ClaimType.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/ClaimType.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/ClaimType.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/ClaimType.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/CreateDriveRequest.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/CreateDriveRequest.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/CreateDriveRequest.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/CreateDriveRequest.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/Device.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/Device.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/Device.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/Device.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/Drive.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/Drive.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/Drive.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/Drive.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/DriveData.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/DriveData.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/DriveData.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/DriveData.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/DriveInfo.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/DriveInfo.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/DriveInfo.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/DriveInfo.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/DriveMetrics.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/DriveMetrics.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/DriveMetrics.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/DriveMetrics.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/DriveStatus.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/DriveStatus.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/DriveStatus.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/DriveStatus.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/DriveType.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/DriveType.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/DriveType.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/DriveType.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/IDEDevice.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/IDEDevice.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/IDEDevice.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/IDEDevice.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/Item.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/Item.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/Item.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/Item.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/MediaType.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/MediaType.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/MediaType.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/MediaType.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/Model.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/Model.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/Model.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/Model.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/NIC.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/NIC.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/NIC.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/NIC.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/SCSIDevice.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/SCSIDevice.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/SCSIDevice.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/SCSIDevice.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/Server.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/Server.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/Server.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/Server.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/ServerInfo.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/ServerInfo.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/ServerInfo.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/ServerInfo.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/ServerMetrics.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/ServerMetrics.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/ServerMetrics.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/ServerMetrics.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/ServerStatus.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/ServerStatus.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/ServerStatus.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/ServerStatus.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/VNC.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/VNC.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/VNC.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/domain/VNC.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/BaseDriveToMap.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/BaseDriveToMap.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/BaseDriveToMap.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/BaseDriveToMap.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/DriveDataToMap.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/DriveDataToMap.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/DriveDataToMap.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/DriveDataToMap.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/KeyValuesDelimitedByBlankLinesToDriveInfo.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/KeyValuesDelimitedByBlankLinesToDriveInfo.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/KeyValuesDelimitedByBlankLinesToDriveInfo.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/KeyValuesDelimitedByBlankLinesToDriveInfo.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/KeyValuesDelimitedByBlankLinesToServerInfo.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/KeyValuesDelimitedByBlankLinesToServerInfo.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/KeyValuesDelimitedByBlankLinesToServerInfo.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/KeyValuesDelimitedByBlankLinesToServerInfo.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToDriveInfoSet.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToDriveInfoSet.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToDriveInfoSet.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToDriveInfoSet.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToListOfMaps.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToListOfMaps.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToListOfMaps.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToListOfMaps.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToServerInfoSet.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToServerInfoSet.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToServerInfoSet.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToServerInfoSet.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ListOfMapsToListOfKeyValuesDelimitedByBlankLines.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ListOfMapsToListOfKeyValuesDelimitedByBlankLines.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ListOfMapsToListOfKeyValuesDelimitedByBlankLines.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ListOfMapsToListOfKeyValuesDelimitedByBlankLines.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToDevices.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToDevices.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToDevices.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToDevices.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToDriveInfo.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToDriveInfo.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToDriveInfo.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToDriveInfo.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToDriveMetrics.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToDriveMetrics.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToDriveMetrics.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToDriveMetrics.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToNICs.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToNICs.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToNICs.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToNICs.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToServerInfo.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToServerInfo.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToServerInfo.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToServerInfo.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToServerMetrics.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToServerMetrics.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToServerMetrics.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/MapToServerMetrics.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ReturnPayload.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ReturnPayload.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ReturnPayload.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ReturnPayload.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ServerToMap.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ServerToMap.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ServerToMap.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/ServerToMap.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/SplitNewlines.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/SplitNewlines.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/SplitNewlines.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/functions/SplitNewlines.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/handlers/CloudSigmaErrorHandler.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/handlers/CloudSigmaErrorHandler.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/handlers/CloudSigmaErrorHandler.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/handlers/CloudSigmaErrorHandler.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/options/CloneDriveOptions.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/options/CloneDriveOptions.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/options/CloneDriveOptions.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/options/CloneDriveOptions.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/predicates/DriveClaimed.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/predicates/DriveClaimed.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/predicates/DriveClaimed.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/predicates/DriveClaimed.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/reference/CloudSigmaConstants.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/reference/CloudSigmaConstants.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/reference/CloudSigmaConstants.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/reference/CloudSigmaConstants.java
diff --git a/cloudsigma/src/main/java/org/jclouds/cloudsigma/util/Servers.java b/providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/util/Servers.java
similarity index 100%
rename from cloudsigma/src/main/java/org/jclouds/cloudsigma/util/Servers.java
rename to providers/cloudsigma/src/main/java/org/jclouds/cloudsigma/util/Servers.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/CloudSigmaAsyncClientTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/CloudSigmaAsyncClientTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/CloudSigmaAsyncClientTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/CloudSigmaAsyncClientTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/ProvidersInPropertiesTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/ProvidersInPropertiesTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/ProvidersInPropertiesTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/ProvidersInPropertiesTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/binders/BindCloneDriveOptionsToPlainTextStringTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/binders/BindCloneDriveOptionsToPlainTextStringTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/binders/BindCloneDriveOptionsToPlainTextStringTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/binders/BindCloneDriveOptionsToPlainTextStringTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/binders/BindDriveDataToPlainTextStringTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/binders/BindDriveDataToPlainTextStringTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/binders/BindDriveDataToPlainTextStringTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/binders/BindDriveDataToPlainTextStringTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/binders/BindDriveToPlainTextStringTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/binders/BindDriveToPlainTextStringTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/binders/BindDriveToPlainTextStringTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/binders/BindDriveToPlainTextStringTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/binders/BindServerToPlainTextStringTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/binders/BindServerToPlainTextStringTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/binders/BindServerToPlainTextStringTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/binders/BindServerToPlainTextStringTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaComputeServiceLiveTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaComputeServiceLiveTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaComputeServiceLiveTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaComputeServiceLiveTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaTemplateBuilderLiveTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaTemplateBuilderLiveTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaTemplateBuilderLiveTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaTemplateBuilderLiveTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/BaseDriveToMapTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/BaseDriveToMapTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/BaseDriveToMapTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/BaseDriveToMapTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/DriveDataToMapTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/DriveDataToMapTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/DriveDataToMapTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/DriveDataToMapTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/KeyValuesDelimitedByBlankLinesToDriveInfoTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/KeyValuesDelimitedByBlankLinesToDriveInfoTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/KeyValuesDelimitedByBlankLinesToDriveInfoTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/KeyValuesDelimitedByBlankLinesToDriveInfoTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/KeyValuesDelimitedByBlankLinesToServerInfoTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/KeyValuesDelimitedByBlankLinesToServerInfoTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/KeyValuesDelimitedByBlankLinesToServerInfoTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/KeyValuesDelimitedByBlankLinesToServerInfoTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToDriveInfoSetTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToDriveInfoSetTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToDriveInfoSetTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToDriveInfoSetTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToListOfMapsTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToListOfMapsTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToListOfMapsTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToListOfMapsTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToServerInfoSetTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToServerInfoSetTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToServerInfoSetTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ListOfKeyValuesDelimitedByBlankLinesToServerInfoSetTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ListOfMapsToListOfKeyValuesDelimitedByBlankLinesTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ListOfMapsToListOfKeyValuesDelimitedByBlankLinesTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ListOfMapsToListOfKeyValuesDelimitedByBlankLinesTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ListOfMapsToListOfKeyValuesDelimitedByBlankLinesTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/MapToDriveInfoTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/MapToDriveInfoTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/MapToDriveInfoTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/MapToDriveInfoTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/MapToServerInfoTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/MapToServerInfoTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/MapToServerInfoTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/MapToServerInfoTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ParseOsFamilyVersion64BitFromImageNameTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ParseOsFamilyVersion64BitFromImageNameTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ParseOsFamilyVersion64BitFromImageNameTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ParseOsFamilyVersion64BitFromImageNameTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ServerToMapTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ServerToMapTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ServerToMapTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/ServerToMapTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/SplitNewlinesTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/SplitNewlinesTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/SplitNewlinesTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/SplitNewlinesTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/handlers/CloudSigmaErrorHandlerTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/handlers/CloudSigmaErrorHandlerTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/handlers/CloudSigmaErrorHandlerTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/handlers/CloudSigmaErrorHandlerTest.java
diff --git a/cloudsigma/src/test/java/org/jclouds/cloudsigma/options/CloneDriveOptionsTest.java b/providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/options/CloneDriveOptionsTest.java
similarity index 100%
rename from cloudsigma/src/test/java/org/jclouds/cloudsigma/options/CloneDriveOptionsTest.java
rename to providers/cloudsigma/src/test/java/org/jclouds/cloudsigma/options/CloneDriveOptionsTest.java
diff --git a/cloudsigma/src/test/resources/create_drive.txt b/providers/cloudsigma/src/test/resources/create_drive.txt
similarity index 100%
rename from cloudsigma/src/test/resources/create_drive.txt
rename to providers/cloudsigma/src/test/resources/create_drive.txt
diff --git a/cloudsigma/src/test/resources/create_server.txt b/providers/cloudsigma/src/test/resources/create_server.txt
similarity index 100%
rename from cloudsigma/src/test/resources/create_server.txt
rename to providers/cloudsigma/src/test/resources/create_server.txt
diff --git a/cloudsigma/src/test/resources/drive.txt b/providers/cloudsigma/src/test/resources/drive.txt
similarity index 100%
rename from cloudsigma/src/test/resources/drive.txt
rename to providers/cloudsigma/src/test/resources/drive.txt
diff --git a/cloudsigma/src/test/resources/drive_data.txt b/providers/cloudsigma/src/test/resources/drive_data.txt
similarity index 100%
rename from cloudsigma/src/test/resources/drive_data.txt
rename to providers/cloudsigma/src/test/resources/drive_data.txt
diff --git a/cloudsigma/src/test/resources/log4j.xml b/providers/cloudsigma/src/test/resources/log4j.xml
similarity index 100%
rename from cloudsigma/src/test/resources/log4j.xml
rename to providers/cloudsigma/src/test/resources/log4j.xml
diff --git a/cloudsigma/src/test/resources/new_server.txt b/providers/cloudsigma/src/test/resources/new_server.txt
similarity index 100%
rename from cloudsigma/src/test/resources/new_server.txt
rename to providers/cloudsigma/src/test/resources/new_server.txt
diff --git a/cloudsigma/src/test/resources/osmatches.json b/providers/cloudsigma/src/test/resources/osmatches.json
similarity index 100%
rename from cloudsigma/src/test/resources/osmatches.json
rename to providers/cloudsigma/src/test/resources/osmatches.json
diff --git a/cloudsigma/src/test/resources/servers.txt b/providers/cloudsigma/src/test/resources/servers.txt
similarity index 100%
rename from cloudsigma/src/test/resources/servers.txt
rename to providers/cloudsigma/src/test/resources/servers.txt
diff --git a/cloudsigma/src/test/resources/uuids.txt b/providers/cloudsigma/src/test/resources/uuids.txt
similarity index 100%
rename from cloudsigma/src/test/resources/uuids.txt
rename to providers/cloudsigma/src/test/resources/uuids.txt
diff --git a/providers/pom.xml b/providers/pom.xml
index 1aae950e1a..ed09ef6c7f 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -33,5 +33,6 @@
     <packaging>pom</packaging>
     <name>jclouds providers project</name>
     <modules>
+        <module>cloudsigma</module>
     </modules>
 </project>