diff --git a/lib/fog/compute.rb b/lib/fog/compute.rb
index 2d20118fc..563fdcc01 100644
--- a/lib/fog/compute.rb
+++ b/lib/fog/compute.rb
@@ -36,7 +36,7 @@ module Fog
         require 'fog/rackspace/compute'
         Fog::Compute::Rackspace.new(attributes)
       when :slicehost
-        require 'fog/compute/slicehost'
+        require 'fog/slicehost/compute'
         Fog::Compute::Slicehost.new(attributes)
       when :stormondemand
         require 'fog/storm_on_demand/compute'
diff --git a/lib/fog/slicehost.rb b/lib/fog/slicehost.rb
index 5da257f8a..7635a43c3 100644
--- a/lib/fog/slicehost.rb
+++ b/lib/fog/slicehost.rb
@@ -5,8 +5,8 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'compute/slicehost')
-    service(:dns,     'slicehost/slicehost')
+    service(:compute, 'slicehost/compute')
+    service(:dns,     'slicehost/dns')
 
   end
 end
diff --git a/lib/fog/compute/slicehost.rb b/lib/fog/slicehost/compute.rb
similarity index 95%
rename from lib/fog/compute/slicehost.rb
rename to lib/fog/slicehost/compute.rb
index 77c16cb66..6b15901b6 100644
--- a/lib/fog/compute/slicehost.rb
+++ b/lib/fog/slicehost/compute.rb
@@ -5,7 +5,7 @@ module Fog
       requires :slicehost_password
       recognizes :host, :port, :scheme, :persistent
 
-      model_path 'fog/compute/models/slicehost'
+      model_path 'fog/slicehost/models/compute'
       model       :flavor
       collection  :flavors
       model       :image
@@ -13,7 +13,7 @@ module Fog
       model       :server
       collection  :servers
 
-      request_path 'fog/compute/requests/slicehost'
+      request_path 'fog/slicehost/requests/compute'
       request :create_slice
       request :delete_slice
       request :get_backups
diff --git a/lib/fog/compute/models/slicehost/flavor.rb b/lib/fog/slicehost/models/compute/flavor.rb
similarity index 100%
rename from lib/fog/compute/models/slicehost/flavor.rb
rename to lib/fog/slicehost/models/compute/flavor.rb
diff --git a/lib/fog/compute/models/slicehost/flavors.rb b/lib/fog/slicehost/models/compute/flavors.rb
similarity index 91%
rename from lib/fog/compute/models/slicehost/flavors.rb
rename to lib/fog/slicehost/models/compute/flavors.rb
index 051620f94..a13d06aa2 100644
--- a/lib/fog/compute/models/slicehost/flavors.rb
+++ b/lib/fog/slicehost/models/compute/flavors.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/compute/models/slicehost/flavor'
+require 'fog/slicehost/models/compute/flavor'
 
 module Fog
   module Compute
diff --git a/lib/fog/compute/models/slicehost/image.rb b/lib/fog/slicehost/models/compute/image.rb
similarity index 100%
rename from lib/fog/compute/models/slicehost/image.rb
rename to lib/fog/slicehost/models/compute/image.rb
diff --git a/lib/fog/compute/models/slicehost/images.rb b/lib/fog/slicehost/models/compute/images.rb
similarity index 90%
rename from lib/fog/compute/models/slicehost/images.rb
rename to lib/fog/slicehost/models/compute/images.rb
index 080590ca2..37a8ec546 100644
--- a/lib/fog/compute/models/slicehost/images.rb
+++ b/lib/fog/slicehost/models/compute/images.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/compute/models/slicehost/image'
+require 'fog/slicehost/models/compute/image'
 
 module Fog
   module Compute
diff --git a/lib/fog/compute/models/slicehost/server.rb b/lib/fog/slicehost/models/compute/server.rb
similarity index 100%
rename from lib/fog/compute/models/slicehost/server.rb
rename to lib/fog/slicehost/models/compute/server.rb
diff --git a/lib/fog/compute/models/slicehost/servers.rb b/lib/fog/slicehost/models/compute/servers.rb
similarity index 94%
rename from lib/fog/compute/models/slicehost/servers.rb
rename to lib/fog/slicehost/models/compute/servers.rb
index e1c04bcaf..b67eb9ffe 100644
--- a/lib/fog/compute/models/slicehost/servers.rb
+++ b/lib/fog/slicehost/models/compute/servers.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/compute/models/slicehost/server'
+require 'fog/slicehost/models/compute/server'
 
 module Fog
   module Compute
diff --git a/lib/fog/compute/parsers/slicehost/create_slice.rb b/lib/fog/slicehost/parsers/compute/create_slice.rb
similarity index 100%
rename from lib/fog/compute/parsers/slicehost/create_slice.rb
rename to lib/fog/slicehost/parsers/compute/create_slice.rb
diff --git a/lib/fog/compute/parsers/slicehost/get_backups.rb b/lib/fog/slicehost/parsers/compute/get_backups.rb
similarity index 100%
rename from lib/fog/compute/parsers/slicehost/get_backups.rb
rename to lib/fog/slicehost/parsers/compute/get_backups.rb
diff --git a/lib/fog/compute/parsers/slicehost/get_flavor.rb b/lib/fog/slicehost/parsers/compute/get_flavor.rb
similarity index 100%
rename from lib/fog/compute/parsers/slicehost/get_flavor.rb
rename to lib/fog/slicehost/parsers/compute/get_flavor.rb
diff --git a/lib/fog/compute/parsers/slicehost/get_flavors.rb b/lib/fog/slicehost/parsers/compute/get_flavors.rb
similarity index 100%
rename from lib/fog/compute/parsers/slicehost/get_flavors.rb
rename to lib/fog/slicehost/parsers/compute/get_flavors.rb
diff --git a/lib/fog/compute/parsers/slicehost/get_image.rb b/lib/fog/slicehost/parsers/compute/get_image.rb
similarity index 100%
rename from lib/fog/compute/parsers/slicehost/get_image.rb
rename to lib/fog/slicehost/parsers/compute/get_image.rb
diff --git a/lib/fog/compute/parsers/slicehost/get_images.rb b/lib/fog/slicehost/parsers/compute/get_images.rb
similarity index 100%
rename from lib/fog/compute/parsers/slicehost/get_images.rb
rename to lib/fog/slicehost/parsers/compute/get_images.rb
diff --git a/lib/fog/compute/parsers/slicehost/get_slice.rb b/lib/fog/slicehost/parsers/compute/get_slice.rb
similarity index 100%
rename from lib/fog/compute/parsers/slicehost/get_slice.rb
rename to lib/fog/slicehost/parsers/compute/get_slice.rb
diff --git a/lib/fog/compute/parsers/slicehost/get_slices.rb b/lib/fog/slicehost/parsers/compute/get_slices.rb
similarity index 100%
rename from lib/fog/compute/parsers/slicehost/get_slices.rb
rename to lib/fog/slicehost/parsers/compute/get_slices.rb
diff --git a/lib/fog/compute/requests/slicehost/create_slice.rb b/lib/fog/slicehost/requests/compute/create_slice.rb
similarity index 96%
rename from lib/fog/compute/requests/slicehost/create_slice.rb
rename to lib/fog/slicehost/requests/compute/create_slice.rb
index 2a94d73df..713146b5b 100644
--- a/lib/fog/compute/requests/slicehost/create_slice.rb
+++ b/lib/fog/slicehost/requests/compute/create_slice.rb
@@ -3,7 +3,7 @@ module Fog
     class Slicehost
       class Real
 
-        require 'fog/compute/parsers/slicehost/create_slice'
+        require 'fog/slicehost/parsers/compute/create_slice'
 
         # Create a new slice
         # ==== Parameters
diff --git a/lib/fog/compute/requests/slicehost/delete_slice.rb b/lib/fog/slicehost/requests/compute/delete_slice.rb
similarity index 100%
rename from lib/fog/compute/requests/slicehost/delete_slice.rb
rename to lib/fog/slicehost/requests/compute/delete_slice.rb
diff --git a/lib/fog/compute/requests/slicehost/get_backups.rb b/lib/fog/slicehost/requests/compute/get_backups.rb
similarity index 92%
rename from lib/fog/compute/requests/slicehost/get_backups.rb
rename to lib/fog/slicehost/requests/compute/get_backups.rb
index 706bb40ed..d9d072570 100644
--- a/lib/fog/compute/requests/slicehost/get_backups.rb
+++ b/lib/fog/slicehost/requests/compute/get_backups.rb
@@ -3,7 +3,7 @@ module Fog
     class Slicehost
       class Real
 
-        require 'fog/compute/parsers/slicehost/get_backups'
+        require 'fog/slicehost/parsers/compute/get_backups'
 
         # Get list of backups
         #
diff --git a/lib/fog/compute/requests/slicehost/get_flavor.rb b/lib/fog/slicehost/requests/compute/get_flavor.rb
similarity index 93%
rename from lib/fog/compute/requests/slicehost/get_flavor.rb
rename to lib/fog/slicehost/requests/compute/get_flavor.rb
index 72d097f17..297663224 100644
--- a/lib/fog/compute/requests/slicehost/get_flavor.rb
+++ b/lib/fog/slicehost/requests/compute/get_flavor.rb
@@ -3,7 +3,7 @@ module Fog
     class Slicehost
       class Real
 
-        require 'fog/compute/parsers/slicehost/get_flavor'
+        require 'fog/slicehost/parsers/compute/get_flavor'
 
         # Get details of a flavor
         #
diff --git a/lib/fog/compute/requests/slicehost/get_flavors.rb b/lib/fog/slicehost/requests/compute/get_flavors.rb
similarity index 91%
rename from lib/fog/compute/requests/slicehost/get_flavors.rb
rename to lib/fog/slicehost/requests/compute/get_flavors.rb
index e7479f5e3..ea61628cd 100644
--- a/lib/fog/compute/requests/slicehost/get_flavors.rb
+++ b/lib/fog/slicehost/requests/compute/get_flavors.rb
@@ -3,7 +3,7 @@ module Fog
     class Slicehost
       class Real
 
-        require 'fog/compute/parsers/slicehost/get_flavors'
+        require 'fog/slicehost/parsers/compute/get_flavors'
 
         # Get list of flavors
         #
diff --git a/lib/fog/compute/requests/slicehost/get_image.rb b/lib/fog/slicehost/requests/compute/get_image.rb
similarity index 92%
rename from lib/fog/compute/requests/slicehost/get_image.rb
rename to lib/fog/slicehost/requests/compute/get_image.rb
index 864991a84..3742a8359 100644
--- a/lib/fog/compute/requests/slicehost/get_image.rb
+++ b/lib/fog/slicehost/requests/compute/get_image.rb
@@ -3,7 +3,7 @@ module Fog
     class Slicehost
       class Real
 
-        require 'fog/compute/parsers/slicehost/get_image'
+        require 'fog/slicehost/parsers/compute/get_image'
 
         # Get details of an image
         #
diff --git a/lib/fog/compute/requests/slicehost/get_images.rb b/lib/fog/slicehost/requests/compute/get_images.rb
similarity index 90%
rename from lib/fog/compute/requests/slicehost/get_images.rb
rename to lib/fog/slicehost/requests/compute/get_images.rb
index 175bdde2e..36f0e869a 100644
--- a/lib/fog/compute/requests/slicehost/get_images.rb
+++ b/lib/fog/slicehost/requests/compute/get_images.rb
@@ -3,7 +3,7 @@ module Fog
     class Slicehost
       class Real
 
-        require 'fog/compute/parsers/slicehost/get_images'
+        require 'fog/slicehost/parsers/compute/get_images'
 
         # Get list of images
         #
diff --git a/lib/fog/compute/requests/slicehost/get_slice.rb b/lib/fog/slicehost/requests/compute/get_slice.rb
similarity index 95%
rename from lib/fog/compute/requests/slicehost/get_slice.rb
rename to lib/fog/slicehost/requests/compute/get_slice.rb
index 21d20afca..bcfcbd39e 100644
--- a/lib/fog/compute/requests/slicehost/get_slice.rb
+++ b/lib/fog/slicehost/requests/compute/get_slice.rb
@@ -3,7 +3,7 @@ module Fog
     class Slicehost
       class Real
 
-        require 'fog/compute/parsers/slicehost/get_slice'
+        require 'fog/slicehost/parsers/compute/get_slice'
 
         # Get details of a slice
         #
diff --git a/lib/fog/compute/requests/slicehost/get_slices.rb b/lib/fog/slicehost/requests/compute/get_slices.rb
similarity index 95%
rename from lib/fog/compute/requests/slicehost/get_slices.rb
rename to lib/fog/slicehost/requests/compute/get_slices.rb
index 5f111a39c..c8feac0a8 100644
--- a/lib/fog/compute/requests/slicehost/get_slices.rb
+++ b/lib/fog/slicehost/requests/compute/get_slices.rb
@@ -3,7 +3,7 @@ module Fog
     class Slicehost
       class Real
 
-        require 'fog/compute/parsers/slicehost/get_slices'
+        require 'fog/slicehost/parsers/compute/get_slices'
 
         # Get list of slices
         #
diff --git a/lib/fog/compute/requests/slicehost/reboot_slice.rb b/lib/fog/slicehost/requests/compute/reboot_slice.rb
similarity index 100%
rename from lib/fog/compute/requests/slicehost/reboot_slice.rb
rename to lib/fog/slicehost/requests/compute/reboot_slice.rb