fix more broken require paths from reorg

lib/fog/bin/aws.rb

@@ -27,7 +27,7 @@ class AWS < Fog::Bin
 
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = case service
+        hash[key] = case key
         when :cdn
           Fog::CDN.new(:provider => 'AWS')
         when :compute

lib/fog/bin/bluebox.rb

@@ -12,7 +12,7 @@ class Bluebox < Fog::Bin
 
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = case service
+        hash[key] = case key
         when :blocks
           location = caller.first
           warning = "[yellow][WARN] Bluebox[:blocks] is deprecated, use Bluebox[:compute] instead[/]"

lib/fog/bin/brightbox.rb

@@ -12,7 +12,7 @@ class Brightbox < Fog::Bin
 
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = case service
+        hash[key] = case key
         when :compute
           Fog::Compute.new(:provider => 'Brightbox')
         else

lib/fog/bin/go_grid.rb

@@ -12,7 +12,7 @@ class GoGrid < Fog::Bin
 
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = case service
+        hash[key] = case key
         when :compute
           Fog::Compute.new(:provider => 'GoGrid')
         when :servers

lib/fog/bin/google.rb

@@ -12,7 +12,7 @@ class Google < Fog::Bin
 
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = case service
+        hash[key] = case key
         when :storage
           Fog::Storage.new(:provider => 'Google')
         else

lib/fog/bin/linode.rb

@@ -14,7 +14,7 @@ class Linode < Fog::Bin
 
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = case service
+        hash[key] = case key
         when :compute
           Fog::Compute.new(:provider => 'Linode')
         when :dns

lib/fog/bin/local.rb

@@ -12,7 +12,7 @@ class Local < Fog::Bin
 
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = case service
+        hash[key] = case key
         when :files
           location = caller.first
           warning = "[yellow][WARN] Local[:files] is deprecated, use Local[:storage] instead[/]"

lib/fog/bin/new_servers.rb

@@ -12,7 +12,7 @@ class NewServers < Fog::Bin
 
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = case service
+        hash[key] = case key
         when :compute
           Fog::Compute.new(:provider => 'NewServers')
         when :new_servers

lib/fog/bin/rackspace.rb

@@ -16,7 +16,7 @@ class Rackspace < Fog::Bin
 
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = case service
+        hash[key] = case key
         when :cdn
           Fog::CDN.new(:provider => 'Rackspace')
         when :compute

lib/fog/bin/slicehost.rb

@@ -20,7 +20,7 @@ class Slicehost < Fog::Bin
           warning << " [light_black](" << location << ")[/] "
           Formatador.display_line(warning)
         end
-        hash[key] = case service
+        hash[key] = case key
         when :compute, :slices
           Fog::Compute.new(:provider => 'Slicehost')
         when :dns

lib/fog/bin/zerigo.rb

@@ -12,7 +12,7 @@ class Zerigo < Fog::Bin
 
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = case service
+        hash[key] = case key
         when :dns
           Fog::DNS.new(:provider => 'Zerigo')
         else

lib/fog/compute/models/brightbox/cloud_ips.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/brightbox/models/compute/cloud_ip'
+require 'fog/compute/models/brightbox/cloud_ip'
 
 module Fog
   module Brightbox

lib/fog/compute/models/brightbox/flavors.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/brightbox/models/compute/flavor'
+require 'fog/compute/models/brightbox/flavor'
 
 module Fog
   module Brightbox

lib/fog/compute/models/brightbox/images.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/brightbox/models/compute/image'
+require 'fog/compute/models/brightbox/image'
 
 module Fog
   module Brightbox

lib/fog/compute/models/brightbox/load_balancers.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/brightbox/models/compute/load_balancer'
+require 'fog/compute/models/brightbox/load_balancer'
 
 module Fog
   module Brightbox

lib/fog/compute/models/brightbox/servers.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/brightbox/models/compute/server'
+require 'fog/compute/models/brightbox/server'
 
 module Fog
   module Brightbox

lib/fog/compute/models/brightbox/users.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/brightbox/models/compute/user'
+require 'fog/compute/models/brightbox/user'
 
 module Fog
   module Brightbox

lib/fog/compute/models/brightbox/zones.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/brightbox/models/compute/zone'
+require 'fog/compute/models/brightbox/zone'
 
 module Fog
   module Brightbox

lib/fog/compute/models/rackspace/flavors.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/rackspace/models/compute/flavor'
+require 'fog/compute/models/rackspace/flavor'
 
 module Fog
   module Rackspace

lib/fog/compute/models/rackspace/images.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/rackspace/models/compute/image'
+require 'fog/compute/models/rackspace/image'
 
 module Fog
   module Rackspace

lib/fog/compute/models/rackspace/servers.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/rackspace/models/compute/server'
+require 'fog/compute/models/rackspace/server'
 
 module Fog
   module Rackspace

lib/fog/compute/models/slicehost/flavors.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/slicehost/models/compute/flavor'
+require 'fog/compute/models/slicehost/flavor'
 
 module Fog
   module Slicehost

lib/fog/compute/models/slicehost/images.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/slicehost/models/compute/image'
+require 'fog/compute/models/slicehost/image'
 
 module Fog
   module Slicehost

lib/fog/compute/models/slicehost/servers.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/slicehost/models/compute/server'
+require 'fog/compute/models/slicehost/server'
 
 module Fog
   module Slicehost

lib/fog/dns/linode.rb

@@ -12,7 +12,7 @@ module Fog
       model       :zone
       collection  :zones
 
-      request_path 'fog/dns/models/linode'
+      request_path 'fog/dns/requests/linode'
       request :domain_create
       request :domain_delete
       request :domain_list

lib/fog/dns/models/aws/records.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/aws/models/dns/record'
+require 'fog/dns/models/aws/record'
 
 module Fog
   module AWS

lib/fog/dns/models/aws/zone.rb

@@ -1,5 +1,5 @@
 require 'fog/core/model'
-# require 'fog/aws/models/dns/records'
+# require 'fog/dns/models/aws/records'
 
 module Fog
   module AWS

lib/fog/dns/models/aws/zones.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/aws/models/dns/zone'
+require 'fog/dns/models/aws/zone'
 
 module Fog
   module AWS

lib/fog/dns/models/linode/records.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/linode/models/dns/record'
+require 'fog/dns/models/linode/record'
 
 module Fog
   module Linode

lib/fog/dns/models/linode/zone.rb

@@ -1,5 +1,5 @@
 require 'fog/core/model'
-require 'fog/linode/models/dns/records'
+require 'fog/dns/models/linode/records'
 
 module Fog
   module Linode

lib/fog/dns/models/linode/zones.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/linode/models/dns/zone'
+require 'fog/dns/models/linode/zone'
 
 module Fog
   module Linode

lib/fog/dns/models/slicehost/records.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/slicehost/models/dns/record'
+require 'fog/dns/models/slicehost/record'
 
 module Fog
   module Slicehost

lib/fog/dns/models/slicehost/zone.rb

@@ -1,5 +1,5 @@
 require 'fog/core/model'
-require 'fog/slicehost/models/dns/records'
+require 'fog/dns/models/slicehost/records'
 
 module Fog
   module Slicehost

lib/fog/dns/models/slicehost/zones.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/slicehost/models/dns/zone'
+require 'fog/dns/models/slicehost/zone'
 
 module Fog
   module Slicehost

lib/fog/dns/zerigo.rb

@@ -12,7 +12,7 @@ module Fog
       model       :zone
       collection  :zones
 
-      request_path 'fog/dns/models/zerigo'
+      request_path 'fog/dns/requests/zerigo'
       request :count_hosts
       request :count_zones
       request :create_host

lib/fog/storage/models/aws/directories.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/aws/models/storage/directory'
+require 'fog/storage/models/aws/directory'
 
 module Fog
   module AWS

lib/fog/storage/models/aws/directory.rb

@@ -1,5 +1,5 @@
 require 'fog/core/model'
-require 'fog/aws/models/storage/files'
+require 'fog/storage/models/aws/files'
 
 module Fog
   module AWS

lib/fog/storage/models/aws/files.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/aws/models/storage/file'
+require 'fog/storage/models/aws/file'
 
 module Fog
   module AWS

lib/fog/storage/models/google/directories.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/google/models/storage/directory'
+require 'fog/storage/models/google/directory'
 
 module Fog
   module Google

lib/fog/storage/models/google/directory.rb

@@ -1,5 +1,5 @@
 require 'fog/core/model'
-require 'fog/google/models/storage/files'
+require 'fog/storage/models/google/files'
 
 module Fog
   module Google

lib/fog/storage/models/google/files.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/google/models/storage/file'
+require 'fog/storage/models/google/file'
 
 module Fog
   module Google

lib/fog/storage/models/local/directories.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/local/models/storage/directory'
+require 'fog/storage/models/local/directory'
 
 module Fog
   module Local

lib/fog/storage/models/local/directory.rb

@@ -1,5 +1,5 @@
 require 'fog/core/model'
-require 'fog/local/models/storage/files'
+require 'fog/storage/models/local/files'
 
 module Fog
   module Local

lib/fog/storage/models/local/files.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/local/models/storage/file'
+require 'fog/storage/models/local/file'
 
 module Fog
   module Local

lib/fog/storage/models/rackspace/directories.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/rackspace/models/storage/directory'
+require 'fog/storage/models/rackspace/directory'
 
 module Fog
   module Rackspace

lib/fog/storage/models/rackspace/directory.rb

@@ -1,5 +1,5 @@
 require 'fog/core/model'
-require 'fog/rackspace/models/storage/files'
+require 'fog/storage/models/rackspace/files'
 
 module Fog
   module Rackspace

lib/fog/storage/models/rackspace/files.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/rackspace/models/storage/file'
+require 'fog/storage/models/rackspace/file'
 
 module Fog
   module Rackspace