diff --git a/lib/fog/compute.rb b/lib/fog/compute.rb
index fa16522d3..af709c096 100644
--- a/lib/fog/compute.rb
+++ b/lib/fog/compute.rb
@@ -27,7 +27,7 @@ module Fog
         require 'fog/compute/linode'
         Fog::Compute::Linode.new(attributes)
       when :newservers
-        require 'fog/compute/new_servers'
+        require 'fog/new_servers/compute'
         Fog::Compute::NewServers.new(attributes)
       when :ninefold
         require 'fog/ninefold/compute'
diff --git a/lib/fog/new_servers.rb b/lib/fog/new_servers.rb
index c805d2d6b..6e32726f1 100644
--- a/lib/fog/new_servers.rb
+++ b/lib/fog/new_servers.rb
@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'compute/new_servers')
+    service(:compute, 'new_servers/compute')
 
   end
 end
diff --git a/lib/fog/compute/new_servers.rb b/lib/fog/new_servers/compute.rb
similarity index 95%
rename from lib/fog/compute/new_servers.rb
rename to lib/fog/new_servers/compute.rb
index e4aaa68c4..f2618a350 100644
--- a/lib/fog/compute/new_servers.rb
+++ b/lib/fog/new_servers/compute.rb
@@ -5,9 +5,9 @@ module Fog
       requires :new_servers_password, :new_servers_username
       recognizes :host, :port, :scheme, :persistent
 
-      model_path 'fog/compute/models/new_servers'
+      model_path 'fog/new_servers/models/compute'
 
-      request_path 'fog/compute/requests/new_servers'
+      request_path 'fog/new_servers/requests/compute'
       request :add_server
       request :cancel_server
       request :get_server
diff --git a/lib/fog/compute/requests/new_servers/add_server.rb b/lib/fog/new_servers/requests/compute/add_server.rb
similarity index 100%
rename from lib/fog/compute/requests/new_servers/add_server.rb
rename to lib/fog/new_servers/requests/compute/add_server.rb
diff --git a/lib/fog/compute/requests/new_servers/cancel_server.rb b/lib/fog/new_servers/requests/compute/cancel_server.rb
similarity index 100%
rename from lib/fog/compute/requests/new_servers/cancel_server.rb
rename to lib/fog/new_servers/requests/compute/cancel_server.rb
diff --git a/lib/fog/compute/requests/new_servers/get_server.rb b/lib/fog/new_servers/requests/compute/get_server.rb
similarity index 100%
rename from lib/fog/compute/requests/new_servers/get_server.rb
rename to lib/fog/new_servers/requests/compute/get_server.rb
diff --git a/lib/fog/compute/requests/new_servers/list_images.rb b/lib/fog/new_servers/requests/compute/list_images.rb
similarity index 100%
rename from lib/fog/compute/requests/new_servers/list_images.rb
rename to lib/fog/new_servers/requests/compute/list_images.rb
diff --git a/lib/fog/compute/requests/new_servers/list_plans.rb b/lib/fog/new_servers/requests/compute/list_plans.rb
similarity index 100%
rename from lib/fog/compute/requests/new_servers/list_plans.rb
rename to lib/fog/new_servers/requests/compute/list_plans.rb
diff --git a/lib/fog/compute/requests/new_servers/list_servers.rb b/lib/fog/new_servers/requests/compute/list_servers.rb
similarity index 100%
rename from lib/fog/compute/requests/new_servers/list_servers.rb
rename to lib/fog/new_servers/requests/compute/list_servers.rb
diff --git a/lib/fog/compute/requests/new_servers/reboot_server.rb b/lib/fog/new_servers/requests/compute/reboot_server.rb
similarity index 100%
rename from lib/fog/compute/requests/new_servers/reboot_server.rb
rename to lib/fog/new_servers/requests/compute/reboot_server.rb