diff --git a/lib/fog/local/storage.rb b/lib/fog/local/storage.rb
index 446b03bc2..6f908879b 100644
--- a/lib/fog/local/storage.rb
+++ b/lib/fog/local/storage.rb
@@ -4,7 +4,7 @@ module Fog
 
       requires :local_root
 
-      model_path 'fog/storage/models/local'
+      model_path 'fog/local/models/storage'
       collection  :directories
       model       :directory
       model       :file
diff --git a/lib/fog/storage/models/ninefold/directories.rb b/lib/fog/ninefold/models/storage/directories.rb
similarity index 96%
rename from lib/fog/storage/models/ninefold/directories.rb
rename to lib/fog/ninefold/models/storage/directories.rb
index e3e12c825..516d429da 100644
--- a/lib/fog/storage/models/ninefold/directories.rb
+++ b/lib/fog/ninefold/models/storage/directories.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/storage/models/ninefold/directory'
+require 'fog/ninefold/models/storage/directory'
 
 module Fog
   module Storage
diff --git a/lib/fog/storage/models/ninefold/directory.rb b/lib/fog/ninefold/models/storage/directory.rb
similarity index 100%
rename from lib/fog/storage/models/ninefold/directory.rb
rename to lib/fog/ninefold/models/storage/directory.rb
diff --git a/lib/fog/storage/models/ninefold/file.rb b/lib/fog/ninefold/models/storage/file.rb
similarity index 100%
rename from lib/fog/storage/models/ninefold/file.rb
rename to lib/fog/ninefold/models/storage/file.rb
diff --git a/lib/fog/storage/models/ninefold/files.rb b/lib/fog/ninefold/models/storage/files.rb
similarity index 97%
rename from lib/fog/storage/models/ninefold/files.rb
rename to lib/fog/ninefold/models/storage/files.rb
index 1ee9f3008..c1fcd7675 100644
--- a/lib/fog/storage/models/ninefold/files.rb
+++ b/lib/fog/ninefold/models/storage/files.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/storage/models/ninefold/file'
+require 'fog/ninefold/models/storage/file'
 
 module Fog
   module Storage
diff --git a/lib/fog/ninefold/ninefold.rb b/lib/fog/ninefold/ninefold.rb
index 02de670b8..64d5ea83b 100644
--- a/lib/fog/ninefold/ninefold.rb
+++ b/lib/fog/ninefold/ninefold.rb
@@ -6,7 +6,7 @@ module Fog
     extend Fog::Provider
 
     service(:compute, 'compute/ninefold')
-    service(:storage, 'storage/ninefold')
+    service(:storage, 'ninefold/storage')
 
   end
 end
diff --git a/lib/fog/storage/requests/ninefold/delete_namespace.rb b/lib/fog/ninefold/requests/storage/delete_namespace.rb
similarity index 100%
rename from lib/fog/storage/requests/ninefold/delete_namespace.rb
rename to lib/fog/ninefold/requests/storage/delete_namespace.rb
diff --git a/lib/fog/storage/requests/ninefold/get_namespace.rb b/lib/fog/ninefold/requests/storage/get_namespace.rb
similarity index 100%
rename from lib/fog/storage/requests/ninefold/get_namespace.rb
rename to lib/fog/ninefold/requests/storage/get_namespace.rb
diff --git a/lib/fog/storage/requests/ninefold/post_namespace.rb b/lib/fog/ninefold/requests/storage/post_namespace.rb
similarity index 100%
rename from lib/fog/storage/requests/ninefold/post_namespace.rb
rename to lib/fog/ninefold/requests/storage/post_namespace.rb
diff --git a/lib/fog/storage/requests/ninefold/put_namespace.rb b/lib/fog/ninefold/requests/storage/put_namespace.rb
similarity index 100%
rename from lib/fog/storage/requests/ninefold/put_namespace.rb
rename to lib/fog/ninefold/requests/storage/put_namespace.rb
diff --git a/lib/fog/storage/ninefold.rb b/lib/fog/ninefold/storage.rb
similarity index 99%
rename from lib/fog/storage/ninefold.rb
rename to lib/fog/ninefold/storage.rb
index 9a180a1f8..df15ddfc4 100644
--- a/lib/fog/storage/ninefold.rb
+++ b/lib/fog/ninefold/storage.rb
@@ -11,7 +11,7 @@ module Fog
 
       requires :ninefold_storage_token, :ninefold_storage_secret
 
-      model_path 'fog/storage/models/ninefold'
+      model_path 'fog/ninefold/models/storage'
       model       :directory
       collection  :directories
       model       :file
diff --git a/lib/fog/storage.rb b/lib/fog/storage.rb
index 74f36dc8d..874355797 100644
--- a/lib/fog/storage.rb
+++ b/lib/fog/storage.rb
@@ -18,7 +18,7 @@ module Fog
         require 'fog/local/storage'
         Fog::Storage::Local.new(attributes)
       when :ninefold
-        require 'fog/storage/ninefold'
+        require 'fog/ninefold/storage'
         Fog::Storage::Ninefold.new(attributes)
       when :rackspace
         require 'fog/storage/rackspace'