fix paths for core requires

fog.gemspec

@@ -246,7 +246,7 @@ Gem::Specification.new do |s|
     lib/fog/bluebox/requests/compute/get_template.rb
     lib/fog/bluebox/requests/compute/get_templates.rb
     lib/fog/bluebox/requests/compute/reboot_block.rb
-    lib/fog/collection.rb
+    lib/fog/core/collection.rb
     lib/fog/connection.rb
     lib/fog/credentials.rb
     lib/fog/deprecation.rb
@@ -313,7 +313,7 @@ Gem::Specification.new do |s|
     lib/fog/local/models/storage/file.rb
     lib/fog/local/models/storage/files.rb
     lib/fog/local/storage.rb
-    lib/fog/model.rb
+    lib/fog/core/model.rb
     lib/fog/new_servers.rb
     lib/fog/new_servers/bin.rb
     lib/fog/new_servers/compute.rb

lib/fog/aws/models/compute/address.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module AWS

lib/fog/aws/models/compute/addresses.rb

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/aws/models/compute/address'
 
 module Fog

lib/fog/aws/models/compute/flavor.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module AWS

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

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/aws/models/compute/flavor'
 
 module Fog

lib/fog/aws/models/compute/image.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module AWS

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

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/aws/models/compute/image'
 
 module Fog

lib/fog/aws/models/compute/key_pair.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module AWS

lib/fog/aws/models/compute/key_pairs.rb

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/aws/models/compute/key_pair'
 
 module Fog

lib/fog/aws/models/compute/security_group.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module AWS

lib/fog/aws/models/compute/security_groups.rb

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/aws/models/compute/security_group'
 
 module Fog

lib/fog/aws/models/compute/server.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module AWS

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

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/aws/models/compute/server'
 
 module Fog

lib/fog/aws/models/compute/snapshot.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module AWS

lib/fog/aws/models/compute/snapshots.rb

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/aws/models/compute/snapshot'
 
 module Fog

lib/fog/aws/models/compute/volume.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module AWS

lib/fog/aws/models/compute/volumes.rb

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/aws/models/compute/volume'
 
 module Fog

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

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

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

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

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module AWS

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

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

lib/fog/bluebox/models/compute/flavor.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Bluebox

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

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/bluebox/models/compute/flavor'
 
 module Fog

lib/fog/bluebox/models/compute/image.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Bluebox

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

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/bluebox/models/compute/image'
 
 module Fog

lib/fog/bluebox/models/compute/server.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Bluebox

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

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/bluebox/models/compute/server'
 
 module Fog

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

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

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

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

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Google

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Local

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

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

lib/fog/new_servers/compute.rb

@@ -1,4 +1,4 @@
-require 'fog/parser'
+require 'fog/core/parser'
 
 module Fog
   module NewServers

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Rackspace

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

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

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Rackspace

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

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

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Rackspace

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Rackspace

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

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

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Slicehost

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

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

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Slicehost

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

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

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Slicehost

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

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

lib/fog/terremark/models/shared/address.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Terremark

lib/fog/terremark/models/shared/network.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Terremark

lib/fog/terremark/models/shared/server.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Terremark

lib/fog/terremark/models/shared/servers.rb

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/terremark/models/shared/server'
 
 module Fog

lib/fog/terremark/models/shared/task.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Terremark

lib/fog/terremark/models/shared/tasks.rb

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/terremark/models/shared/server'
 
 module Fog

lib/fog/terremark/models/shared/vdc.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Terremark