fix load paths for shared initializers

lib/fog/cdn.rb

@@ -5,10 +5,10 @@ module Fog
       attributes = attributes.dup # prevent delete from having side effects
       case provider = attributes.delete(:provider)
       when 'AWS'
-        require 'fog/aws'
+        require 'fog/cdn/aws'
         Fog::AWS::CDN.new(attributes)
       when 'Rackspace'
-        require 'fog/rackspace'
+        require 'fog/cdn/rackspace'
         Fog::Rackspace::CDN.new(attributes)
       else
         raise ArgumentError.new("#{provider} is not a recognized storage provider")

lib/fog/compute.rb

@@ -5,28 +5,28 @@ module Fog
       attributes = attributes.dup # prevent delete from having side effects
       case provider = attributes.delete(:provider)
       when 'AWS'
-        require 'fog/aws'
+        require 'fog/compute/aws'
         Fog::AWS::Compute.new(attributes)
       when 'Bluebox'
-        require 'fog/bluebox'
+        require 'fog/compute/bluebox'
         Fog::Bluebox::Compute.new(attributes)
       when 'Brightbox'
-        require 'fog/brightbox'
+        require 'fog/compute/brightbox'
         Fog::Brightbox::Compute.new(attributes)
       when 'GoGrid'
-        require 'fog/go_grid'
+        require 'fog/compute/go_grid'
         Fog::GoGrid::Compute.new(attributes)
       when 'Linode'
-        require 'fog/linode'
+        require 'fog/compute/linode'
         Fog::Linode::Compute.new(attributes)
       when 'NewServers'
-        require 'fog/new_servers'
+        require 'fog/compute/new_servers'
         Fog::NewServers::Compute.new(attributes)
       when 'Rackspace'
-        require 'fog/rackspace'
+        require 'fog/compute/rackspace'
         Fog::Rackspace::Compute.new(attributes)
       when 'Slicehost'
-        require 'fog/slicehost'
+        require 'fog/compute/slicehost'
         Fog::Slicehost::Compute.new(attributes)
       else
         raise ArgumentError.new("#{provider} is not a recognized compute provider")

lib/fog/dns.rb

@@ -5,16 +5,16 @@ module Fog
       attributes = attributes.dup # prevent delete from having side effects
       case provider = attributes.delete(:provider)
       when 'AWS'
-        require 'fog/aws'
+        require 'fog/dns/aws'
         Fog::AWS::DNS.new(attributes)
       when 'Linode'
-        require 'fog/linode'
+        require 'fog/dns/linode'
         Fog::Linode::DNS.new(attributes)
       when 'Slicehost'
-        require 'fog/slicehost'
+        require 'fog/dns/slicehost'
         Fog::Slicehost::DNS.new(attributes)
       when 'Zerigo'
-        require 'fog/zerigo'
+        require 'fog/dns/zerigo'
         Fog::Zerigo::DNS.new(attributes)
       else
         raise ArgumentError.new("#{provider} is not a recognized storage provider")

lib/fog/providers/rackspace.rb

@@ -6,9 +6,9 @@ module Fog
     extend Fog::Provider
 
     service(:cdn,     'cdn/rackspace')
-    service(:compute, 'rackspace/compute')
+    service(:compute, 'compute/rackspace')
     service(:files,   'storage/rackspace')
-    service(:servers, 'rackspace/compute')
+    service(:servers, 'compute/rackspace')
     service(:storage, 'storage/rackspace')
 
     def self.authenticate(options)

lib/fog/storage.rb

@@ -5,16 +5,16 @@ module Fog
       attributes = attributes.dup # prevent delete from having side effects
       case provider = attributes.delete(:provider)
       when 'AWS'
-        require 'fog/aws'
+        require 'fog/storage/aws'
         Fog::AWS::Storage.new(attributes)
       when 'Google'
-        require 'fog/google'
+        require 'fog/storage/google'
         Fog::Google::Storage.new(attributes)
       when 'Local'
-        require 'fog/local'
+        require 'fog/storage/local'
         Fog::Local::Storage.new(attributes)
       when 'Rackspace'
-        require 'fog/rackspace'
+        require 'fog/storage/rackspace'
         Fog::Rackspace::Storage.new(attributes)
       else
         raise ArgumentError.new("#{provider} is not a recognized storage provider")