[bin] consolidate

bin/fog

@@ -8,7 +8,7 @@ unless Fog.credentials
   exit
 end
 
-require 'fog/core/bin'
+require 'fog/bin'
 
 providers = Fog.providers.map{|provider| provider.to_s}
 providers = if providers.length > 1

lib/fog/bin.rb

@@ -72,16 +72,16 @@ module Fog
 
 end
 
-require 'fog/aws/bin'
-require 'fog/bluebox/bin'
-require 'fog/brightbox/bin'
-require 'fog/go_grid/bin'
-require 'fog/google/bin'
-require 'fog/linode/bin'
-require 'fog/local/bin'
-require 'fog/new_servers/bin'
-require 'fog/rackspace/bin'
-require 'fog/slicehost/bin'
-require 'fog/terremark/bin'
-require 'fog/vcloud/bin'
-require 'fog/zerigo/bin'
+require 'fog/bin/aws'
+require 'fog/bin/bluebox'
+require 'fog/bin/brightbox'
+require 'fog/bin/go_grid'
+require 'fog/bin/google'
+require 'fog/bin/linode'
+require 'fog/bin/local'
+require 'fog/bin/new_servers'
+require 'fog/bin/rackspace'
+require 'fog/bin/slicehost'
+require 'fog/bin/terremark'
+require 'fog/bin/vcloud'
+require 'fog/bin/zerigo'

lib/fog/storage/google.rb

@@ -5,13 +5,13 @@ module Fog
       requires :google_storage_access_key_id, :google_storage_secret_access_key
       recognizes :host, :port, :scheme, :persistent
 
-      model_path 'fog/google/models/storage'
+      model_path 'fog/storage/models/google'
       collection  :directories
       model       :directory
       collection  :files
       model       :file
 
-      request_path 'fog/google/requests/storage'
+      request_path 'fog/storage/requests/google'
       request :copy_object
       request :delete_bucket
       request :delete_object

lib/fog/storage/local.rb

@@ -4,7 +4,7 @@ module Fog
 
       requires :local_root
 
-      model_path 'fog/local/models/storage'
+      model_path 'fog/storage/models/local'
       collection  :directories
       model       :directory
       model       :file

lib/fog/storage/rackspace.rb

@@ -5,13 +5,13 @@ module Fog
       requires :rackspace_api_key, :rackspace_username
       recognizes :rackspace_auth_url, :persistent
 
-      model_path 'fog/rackspace/models/storage'
+      model_path 'fog/storage/models/rackspace'
       model       :directory
       collection  :directories
       model       :file
       collection  :files
 
-      request_path 'fog/rackspace/requests/storage'
+      request_path 'fog/storage/requests/rackspace'
       request :delete_container
       request :delete_object
       request :get_container