diff --git a/lib/fog/compute.rb b/lib/fog/compute.rb
index cee9b79d9..b3e7ed37d 100644
--- a/lib/fog/compute.rb
+++ b/lib/fog/compute.rb
@@ -33,7 +33,7 @@ module Fog
         require 'fog/compute/ninefold'
         Fog::Compute::Ninefold.new(attributes)
       when :rackspace
-        require 'fog/compute/rackspace'
+        require 'fog/rackspace/compute'
         Fog::Compute::Rackspace.new(attributes)
       when :slicehost
         require 'fog/compute/slicehost'
diff --git a/lib/fog/rackspace.rb b/lib/fog/rackspace.rb
index faefe2bb6..b9e6ddfca 100644
--- a/lib/fog/rackspace.rb
+++ b/lib/fog/rackspace.rb
@@ -6,7 +6,7 @@ module Fog
     extend Fog::Provider
 
     service(:cdn,             'rackspace/cdn')
-    service(:compute,         'compute/rackspace')
+    service(:compute,         'rackspace/compute')
     service(:storage,         'rackspace/storage')
     service(:load_balancers,  'rackspace/load_balancers')
 
diff --git a/lib/fog/compute/rackspace.rb b/lib/fog/rackspace/compute.rb
similarity index 97%
rename from lib/fog/compute/rackspace.rb
rename to lib/fog/rackspace/compute.rb
index 730df2dc2..bfe0b6c1d 100644
--- a/lib/fog/compute/rackspace.rb
+++ b/lib/fog/rackspace/compute.rb
@@ -6,7 +6,7 @@ module Fog
       recognizes :rackspace_auth_url, :rackspace_servicenet, :persistent
       recognizes :rackspace_auth_token, :rackspace_management_url
 
-      model_path 'fog/compute/models/rackspace'
+      model_path 'fog/rackspace/models/compute'
       model       :flavor
       collection  :flavors
       model       :image
@@ -14,7 +14,7 @@ module Fog
       model       :server
       collection  :servers
 
-      request_path 'fog/compute/requests/rackspace'
+      request_path 'fog/rackspace/requests/compute'
       request :confirm_resized_server
       request :create_image
       request :create_server
diff --git a/lib/fog/compute/models/rackspace/flavor.rb b/lib/fog/rackspace/models/compute/flavor.rb
similarity index 100%
rename from lib/fog/compute/models/rackspace/flavor.rb
rename to lib/fog/rackspace/models/compute/flavor.rb
diff --git a/lib/fog/compute/models/rackspace/flavors.rb b/lib/fog/rackspace/models/compute/flavors.rb
similarity index 91%
rename from lib/fog/compute/models/rackspace/flavors.rb
rename to lib/fog/rackspace/models/compute/flavors.rb
index 3f6c9b867..e7b72242c 100644
--- a/lib/fog/compute/models/rackspace/flavors.rb
+++ b/lib/fog/rackspace/models/compute/flavors.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/compute/models/rackspace/flavor'
+require 'fog/rackspace/models/compute/flavor'
 
 module Fog
   module Compute
diff --git a/lib/fog/compute/models/rackspace/image.rb b/lib/fog/rackspace/models/compute/image.rb
similarity index 100%
rename from lib/fog/compute/models/rackspace/image.rb
rename to lib/fog/rackspace/models/compute/image.rb
diff --git a/lib/fog/compute/models/rackspace/images.rb b/lib/fog/rackspace/models/compute/images.rb
similarity index 93%
rename from lib/fog/compute/models/rackspace/images.rb
rename to lib/fog/rackspace/models/compute/images.rb
index a7b273cfc..62f51a470 100644
--- a/lib/fog/compute/models/rackspace/images.rb
+++ b/lib/fog/rackspace/models/compute/images.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/compute/models/rackspace/image'
+require 'fog/rackspace/models/compute/image'
 
 module Fog
   module Compute
diff --git a/lib/fog/compute/models/rackspace/server.rb b/lib/fog/rackspace/models/compute/server.rb
similarity index 100%
rename from lib/fog/compute/models/rackspace/server.rb
rename to lib/fog/rackspace/models/compute/server.rb
diff --git a/lib/fog/compute/models/rackspace/servers.rb b/lib/fog/rackspace/models/compute/servers.rb
similarity index 94%
rename from lib/fog/compute/models/rackspace/servers.rb
rename to lib/fog/rackspace/models/compute/servers.rb
index 8b5653f30..4214913cc 100644
--- a/lib/fog/compute/models/rackspace/servers.rb
+++ b/lib/fog/rackspace/models/compute/servers.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/compute/models/rackspace/server'
+require 'fog/rackspace/models/compute/server'
 
 module Fog
   module Compute
diff --git a/lib/fog/compute/requests/rackspace/confirm_resized_server.rb b/lib/fog/rackspace/requests/compute/confirm_resized_server.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/confirm_resized_server.rb
rename to lib/fog/rackspace/requests/compute/confirm_resized_server.rb
diff --git a/lib/fog/compute/requests/rackspace/create_image.rb b/lib/fog/rackspace/requests/compute/create_image.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/create_image.rb
rename to lib/fog/rackspace/requests/compute/create_image.rb
diff --git a/lib/fog/compute/requests/rackspace/create_server.rb b/lib/fog/rackspace/requests/compute/create_server.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/create_server.rb
rename to lib/fog/rackspace/requests/compute/create_server.rb
diff --git a/lib/fog/compute/requests/rackspace/delete_image.rb b/lib/fog/rackspace/requests/compute/delete_image.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/delete_image.rb
rename to lib/fog/rackspace/requests/compute/delete_image.rb
diff --git a/lib/fog/compute/requests/rackspace/delete_server.rb b/lib/fog/rackspace/requests/compute/delete_server.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/delete_server.rb
rename to lib/fog/rackspace/requests/compute/delete_server.rb
diff --git a/lib/fog/compute/requests/rackspace/get_flavor_details.rb b/lib/fog/rackspace/requests/compute/get_flavor_details.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/get_flavor_details.rb
rename to lib/fog/rackspace/requests/compute/get_flavor_details.rb
diff --git a/lib/fog/compute/requests/rackspace/get_image_details.rb b/lib/fog/rackspace/requests/compute/get_image_details.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/get_image_details.rb
rename to lib/fog/rackspace/requests/compute/get_image_details.rb
diff --git a/lib/fog/compute/requests/rackspace/get_server_details.rb b/lib/fog/rackspace/requests/compute/get_server_details.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/get_server_details.rb
rename to lib/fog/rackspace/requests/compute/get_server_details.rb
diff --git a/lib/fog/compute/requests/rackspace/list_addresses.rb b/lib/fog/rackspace/requests/compute/list_addresses.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/list_addresses.rb
rename to lib/fog/rackspace/requests/compute/list_addresses.rb
diff --git a/lib/fog/compute/requests/rackspace/list_flavors.rb b/lib/fog/rackspace/requests/compute/list_flavors.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/list_flavors.rb
rename to lib/fog/rackspace/requests/compute/list_flavors.rb
diff --git a/lib/fog/compute/requests/rackspace/list_flavors_detail.rb b/lib/fog/rackspace/requests/compute/list_flavors_detail.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/list_flavors_detail.rb
rename to lib/fog/rackspace/requests/compute/list_flavors_detail.rb
diff --git a/lib/fog/compute/requests/rackspace/list_images.rb b/lib/fog/rackspace/requests/compute/list_images.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/list_images.rb
rename to lib/fog/rackspace/requests/compute/list_images.rb
diff --git a/lib/fog/compute/requests/rackspace/list_images_detail.rb b/lib/fog/rackspace/requests/compute/list_images_detail.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/list_images_detail.rb
rename to lib/fog/rackspace/requests/compute/list_images_detail.rb
diff --git a/lib/fog/compute/requests/rackspace/list_private_addresses.rb b/lib/fog/rackspace/requests/compute/list_private_addresses.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/list_private_addresses.rb
rename to lib/fog/rackspace/requests/compute/list_private_addresses.rb
diff --git a/lib/fog/compute/requests/rackspace/list_public_addresses.rb b/lib/fog/rackspace/requests/compute/list_public_addresses.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/list_public_addresses.rb
rename to lib/fog/rackspace/requests/compute/list_public_addresses.rb
diff --git a/lib/fog/compute/requests/rackspace/list_servers.rb b/lib/fog/rackspace/requests/compute/list_servers.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/list_servers.rb
rename to lib/fog/rackspace/requests/compute/list_servers.rb
diff --git a/lib/fog/compute/requests/rackspace/list_servers_detail.rb b/lib/fog/rackspace/requests/compute/list_servers_detail.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/list_servers_detail.rb
rename to lib/fog/rackspace/requests/compute/list_servers_detail.rb
diff --git a/lib/fog/compute/requests/rackspace/reboot_server.rb b/lib/fog/rackspace/requests/compute/reboot_server.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/reboot_server.rb
rename to lib/fog/rackspace/requests/compute/reboot_server.rb
diff --git a/lib/fog/compute/requests/rackspace/resize_server.rb b/lib/fog/rackspace/requests/compute/resize_server.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/resize_server.rb
rename to lib/fog/rackspace/requests/compute/resize_server.rb
diff --git a/lib/fog/compute/requests/rackspace/revert_resized_server.rb b/lib/fog/rackspace/requests/compute/revert_resized_server.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/revert_resized_server.rb
rename to lib/fog/rackspace/requests/compute/revert_resized_server.rb
diff --git a/lib/fog/compute/requests/rackspace/server_action.rb b/lib/fog/rackspace/requests/compute/server_action.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/server_action.rb
rename to lib/fog/rackspace/requests/compute/server_action.rb
diff --git a/lib/fog/compute/requests/rackspace/update_server.rb b/lib/fog/rackspace/requests/compute/update_server.rb
similarity index 100%
rename from lib/fog/compute/requests/rackspace/update_server.rb
rename to lib/fog/rackspace/requests/compute/update_server.rb