diff --git a/lib/fog/compute.rb b/lib/fog/compute.rb
index b3e7ed37d..fa16522d3 100644
--- a/lib/fog/compute.rb
+++ b/lib/fog/compute.rb
@@ -30,7 +30,7 @@ module Fog
         require 'fog/compute/new_servers'
         Fog::Compute::NewServers.new(attributes)
       when :ninefold
-        require 'fog/compute/ninefold'
+        require 'fog/ninefold/compute'
         Fog::Compute::Ninefold.new(attributes)
       when :rackspace
         require 'fog/rackspace/compute'
diff --git a/lib/fog/ninefold.rb b/lib/fog/ninefold.rb
index 64d5ea83b..a609603d7 100644
--- a/lib/fog/ninefold.rb
+++ b/lib/fog/ninefold.rb
@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'compute/ninefold')
+    service(:compute, 'ninefold/compute')
     service(:storage, 'ninefold/storage')
 
   end
diff --git a/lib/fog/compute/ninefold.rb b/lib/fog/ninefold/compute.rb
similarity index 98%
rename from lib/fog/compute/ninefold.rb
rename to lib/fog/ninefold/compute.rb
index d1a34b233..3eb899418 100644
--- a/lib/fog/compute/ninefold.rb
+++ b/lib/fog/ninefold/compute.rb
@@ -6,7 +6,7 @@ module Fog
 
       requires :ninefold_compute_key, :ninefold_compute_secret
 
-      model_path 'fog/compute/models/ninefold'
+      model_path 'fog/ninefold/models/compute'
       model       :server
       collection  :servers
       model       :flavor
diff --git a/lib/fog/compute/models/ninefold/address.rb b/lib/fog/ninefold/models/compute/address.rb
similarity index 100%
rename from lib/fog/compute/models/ninefold/address.rb
rename to lib/fog/ninefold/models/compute/address.rb
diff --git a/lib/fog/compute/models/ninefold/addresses.rb b/lib/fog/ninefold/models/compute/addresses.rb
similarity index 92%
rename from lib/fog/compute/models/ninefold/addresses.rb
rename to lib/fog/ninefold/models/compute/addresses.rb
index 9aea62546..a1b7e1982 100644
--- a/lib/fog/compute/models/ninefold/addresses.rb
+++ b/lib/fog/ninefold/models/compute/addresses.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/compute/models/ninefold/address'
+require 'fog/ninefold/models/compute/address'
 
 module Fog
   module Compute
diff --git a/lib/fog/compute/models/ninefold/flavor.rb b/lib/fog/ninefold/models/compute/flavor.rb
similarity index 100%
rename from lib/fog/compute/models/ninefold/flavor.rb
rename to lib/fog/ninefold/models/compute/flavor.rb
diff --git a/lib/fog/compute/models/ninefold/flavors.rb b/lib/fog/ninefold/models/compute/flavors.rb
similarity index 91%
rename from lib/fog/compute/models/ninefold/flavors.rb
rename to lib/fog/ninefold/models/compute/flavors.rb
index 495b70125..d678e5e4d 100644
--- a/lib/fog/compute/models/ninefold/flavors.rb
+++ b/lib/fog/ninefold/models/compute/flavors.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/compute/models/ninefold/flavor'
+require 'fog/ninefold/models/compute/flavor'
 
 module Fog
   module Compute
diff --git a/lib/fog/compute/models/ninefold/image.rb b/lib/fog/ninefold/models/compute/image.rb
similarity index 100%
rename from lib/fog/compute/models/ninefold/image.rb
rename to lib/fog/ninefold/models/compute/image.rb
diff --git a/lib/fog/compute/models/ninefold/images.rb b/lib/fog/ninefold/models/compute/images.rb
similarity index 93%
rename from lib/fog/compute/models/ninefold/images.rb
rename to lib/fog/ninefold/models/compute/images.rb
index f515bffec..5258c920a 100644
--- a/lib/fog/compute/models/ninefold/images.rb
+++ b/lib/fog/ninefold/models/compute/images.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/compute/models/ninefold/image'
+require 'fog/ninefold/models/compute/image'
 
 module Fog
   module Compute
diff --git a/lib/fog/compute/models/ninefold/ip_forwarding_rule.rb b/lib/fog/ninefold/models/compute/ip_forwarding_rule.rb
similarity index 100%
rename from lib/fog/compute/models/ninefold/ip_forwarding_rule.rb
rename to lib/fog/ninefold/models/compute/ip_forwarding_rule.rb
diff --git a/lib/fog/compute/models/ninefold/ip_forwarding_rules.rb b/lib/fog/ninefold/models/compute/ip_forwarding_rules.rb
similarity index 91%
rename from lib/fog/compute/models/ninefold/ip_forwarding_rules.rb
rename to lib/fog/ninefold/models/compute/ip_forwarding_rules.rb
index 55d0a1fa3..af835e54c 100644
--- a/lib/fog/compute/models/ninefold/ip_forwarding_rules.rb
+++ b/lib/fog/ninefold/models/compute/ip_forwarding_rules.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/compute/models/ninefold/ip_forwarding_rule'
+require 'fog/ninefold/models/compute/ip_forwarding_rule'
 
 module Fog
   module Compute
diff --git a/lib/fog/compute/models/ninefold/server.rb b/lib/fog/ninefold/models/compute/server.rb
similarity index 100%
rename from lib/fog/compute/models/ninefold/server.rb
rename to lib/fog/ninefold/models/compute/server.rb
diff --git a/lib/fog/compute/models/ninefold/servers.rb b/lib/fog/ninefold/models/compute/servers.rb
similarity index 92%
rename from lib/fog/compute/models/ninefold/servers.rb
rename to lib/fog/ninefold/models/compute/servers.rb
index 0ca627aaa..01e2ec109 100644
--- a/lib/fog/compute/models/ninefold/servers.rb
+++ b/lib/fog/ninefold/models/compute/servers.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/compute/models/ninefold/server'
+require 'fog/ninefold/models/compute/server'
 
 module Fog
   module Compute
diff --git a/lib/fog/compute/requests/ninefold/associate_ip_address.rb b/lib/fog/ninefold/requests/compute/associate_ip_address.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/associate_ip_address.rb
rename to lib/fog/ninefold/requests/compute/associate_ip_address.rb
diff --git a/lib/fog/compute/requests/ninefold/change_service_for_virtual_machine.rb b/lib/fog/ninefold/requests/compute/change_service_for_virtual_machine.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/change_service_for_virtual_machine.rb
rename to lib/fog/ninefold/requests/compute/change_service_for_virtual_machine.rb
diff --git a/lib/fog/compute/requests/ninefold/create_ip_forwarding_rule.rb b/lib/fog/ninefold/requests/compute/create_ip_forwarding_rule.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/create_ip_forwarding_rule.rb
rename to lib/fog/ninefold/requests/compute/create_ip_forwarding_rule.rb
diff --git a/lib/fog/compute/requests/ninefold/delete_ip_forwarding_rule.rb b/lib/fog/ninefold/requests/compute/delete_ip_forwarding_rule.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/delete_ip_forwarding_rule.rb
rename to lib/fog/ninefold/requests/compute/delete_ip_forwarding_rule.rb
diff --git a/lib/fog/compute/requests/ninefold/deploy_virtual_machine.rb b/lib/fog/ninefold/requests/compute/deploy_virtual_machine.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/deploy_virtual_machine.rb
rename to lib/fog/ninefold/requests/compute/deploy_virtual_machine.rb
diff --git a/lib/fog/compute/requests/ninefold/destroy_virtual_machine.rb b/lib/fog/ninefold/requests/compute/destroy_virtual_machine.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/destroy_virtual_machine.rb
rename to lib/fog/ninefold/requests/compute/destroy_virtual_machine.rb
diff --git a/lib/fog/compute/requests/ninefold/disable_static_nat.rb b/lib/fog/ninefold/requests/compute/disable_static_nat.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/disable_static_nat.rb
rename to lib/fog/ninefold/requests/compute/disable_static_nat.rb
diff --git a/lib/fog/compute/requests/ninefold/disassociate_ip_address.rb b/lib/fog/ninefold/requests/compute/disassociate_ip_address.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/disassociate_ip_address.rb
rename to lib/fog/ninefold/requests/compute/disassociate_ip_address.rb
diff --git a/lib/fog/compute/requests/ninefold/enable_static_nat.rb b/lib/fog/ninefold/requests/compute/enable_static_nat.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/enable_static_nat.rb
rename to lib/fog/ninefold/requests/compute/enable_static_nat.rb
diff --git a/lib/fog/compute/requests/ninefold/list_accounts.rb b/lib/fog/ninefold/requests/compute/list_accounts.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/list_accounts.rb
rename to lib/fog/ninefold/requests/compute/list_accounts.rb
diff --git a/lib/fog/compute/requests/ninefold/list_async_jobs.rb b/lib/fog/ninefold/requests/compute/list_async_jobs.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/list_async_jobs.rb
rename to lib/fog/ninefold/requests/compute/list_async_jobs.rb
diff --git a/lib/fog/compute/requests/ninefold/list_capabilities.rb b/lib/fog/ninefold/requests/compute/list_capabilities.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/list_capabilities.rb
rename to lib/fog/ninefold/requests/compute/list_capabilities.rb
diff --git a/lib/fog/compute/requests/ninefold/list_disk_offerings.rb b/lib/fog/ninefold/requests/compute/list_disk_offerings.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/list_disk_offerings.rb
rename to lib/fog/ninefold/requests/compute/list_disk_offerings.rb
diff --git a/lib/fog/compute/requests/ninefold/list_events.rb b/lib/fog/ninefold/requests/compute/list_events.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/list_events.rb
rename to lib/fog/ninefold/requests/compute/list_events.rb
diff --git a/lib/fog/compute/requests/ninefold/list_hypervisors.rb b/lib/fog/ninefold/requests/compute/list_hypervisors.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/list_hypervisors.rb
rename to lib/fog/ninefold/requests/compute/list_hypervisors.rb
diff --git a/lib/fog/compute/requests/ninefold/list_ip_forwarding_rules.rb b/lib/fog/ninefold/requests/compute/list_ip_forwarding_rules.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/list_ip_forwarding_rules.rb
rename to lib/fog/ninefold/requests/compute/list_ip_forwarding_rules.rb
diff --git a/lib/fog/compute/requests/ninefold/list_network_offerings.rb b/lib/fog/ninefold/requests/compute/list_network_offerings.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/list_network_offerings.rb
rename to lib/fog/ninefold/requests/compute/list_network_offerings.rb
diff --git a/lib/fog/compute/requests/ninefold/list_networks.rb b/lib/fog/ninefold/requests/compute/list_networks.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/list_networks.rb
rename to lib/fog/ninefold/requests/compute/list_networks.rb
diff --git a/lib/fog/compute/requests/ninefold/list_public_ip_addresses.rb b/lib/fog/ninefold/requests/compute/list_public_ip_addresses.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/list_public_ip_addresses.rb
rename to lib/fog/ninefold/requests/compute/list_public_ip_addresses.rb
diff --git a/lib/fog/compute/requests/ninefold/list_resource_limits.rb b/lib/fog/ninefold/requests/compute/list_resource_limits.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/list_resource_limits.rb
rename to lib/fog/ninefold/requests/compute/list_resource_limits.rb
diff --git a/lib/fog/compute/requests/ninefold/list_service_offerings.rb b/lib/fog/ninefold/requests/compute/list_service_offerings.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/list_service_offerings.rb
rename to lib/fog/ninefold/requests/compute/list_service_offerings.rb
diff --git a/lib/fog/compute/requests/ninefold/list_templates.rb b/lib/fog/ninefold/requests/compute/list_templates.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/list_templates.rb
rename to lib/fog/ninefold/requests/compute/list_templates.rb
diff --git a/lib/fog/compute/requests/ninefold/list_virtual_machines.rb b/lib/fog/ninefold/requests/compute/list_virtual_machines.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/list_virtual_machines.rb
rename to lib/fog/ninefold/requests/compute/list_virtual_machines.rb
diff --git a/lib/fog/compute/requests/ninefold/list_zones.rb b/lib/fog/ninefold/requests/compute/list_zones.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/list_zones.rb
rename to lib/fog/ninefold/requests/compute/list_zones.rb
diff --git a/lib/fog/compute/requests/ninefold/query_async_job_result.rb b/lib/fog/ninefold/requests/compute/query_async_job_result.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/query_async_job_result.rb
rename to lib/fog/ninefold/requests/compute/query_async_job_result.rb
diff --git a/lib/fog/compute/requests/ninefold/reboot_virtual_machine.rb b/lib/fog/ninefold/requests/compute/reboot_virtual_machine.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/reboot_virtual_machine.rb
rename to lib/fog/ninefold/requests/compute/reboot_virtual_machine.rb
diff --git a/lib/fog/compute/requests/ninefold/reset_password_for_virtual_machine.rb b/lib/fog/ninefold/requests/compute/reset_password_for_virtual_machine.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/reset_password_for_virtual_machine.rb
rename to lib/fog/ninefold/requests/compute/reset_password_for_virtual_machine.rb
diff --git a/lib/fog/compute/requests/ninefold/start_virtual_machine.rb b/lib/fog/ninefold/requests/compute/start_virtual_machine.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/start_virtual_machine.rb
rename to lib/fog/ninefold/requests/compute/start_virtual_machine.rb
diff --git a/lib/fog/compute/requests/ninefold/stop_virtual_machine.rb b/lib/fog/ninefold/requests/compute/stop_virtual_machine.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/stop_virtual_machine.rb
rename to lib/fog/ninefold/requests/compute/stop_virtual_machine.rb
diff --git a/lib/fog/compute/requests/ninefold/update_virtual_machine.rb b/lib/fog/ninefold/requests/compute/update_virtual_machine.rb
similarity index 100%
rename from lib/fog/compute/requests/ninefold/update_virtual_machine.rb
rename to lib/fog/ninefold/requests/compute/update_virtual_machine.rb