clean up by changing service abstraction into a class

bin/fog

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'fog')
 require 'irb'
 require 'yaml'
 require File.join('fog', 'credentials')
-Fog.credential = ARGV.first
+Fog.credential = ARGV.first ? ARGV.first.to_sym : nil
 Fog.bin = true
 unless Fog.credentials
   exit

lib/fog.rb

@@ -27,17 +27,6 @@ require 'fog/parser'
 require 'fog/service'
 require 'fog/ssh'
 
-require 'fog/aws'
-require 'fog/bluebox'
-require 'fog/go_grid'
-require 'fog/linode'
-require 'fog/local'
-require 'fog/new_servers'
-require 'fog/rackspace'
-require 'fog/slicehost'
-require 'fog/terremark'
-require 'fog/vcloud'
-
 module Fog
 
   unless const_defined?(:VERSION)
@@ -92,3 +81,14 @@ module Fog
   end
 
 end
+
+require 'fog/aws'
+require 'fog/bluebox'
+require 'fog/go_grid'
+require 'fog/linode'
+require 'fog/local'
+require 'fog/new_servers'
+require 'fog/rackspace'
+require 'fog/slicehost'
+require 'fog/terremark'
+require 'fog/vcloud'

lib/fog/aws/ec2.rb

@@ -1,7 +1,6 @@
 module Fog
   module AWS
-    module EC2
-      extend Fog::Service
+    class EC2 < Fog::Service
 
       requires :aws_access_key_id, :aws_secret_access_key
 

lib/fog/aws/elb.rb

@@ -1,7 +1,6 @@
 module Fog
   module AWS
-    module ELB
-      extend Fog::Service
+    class ELB < Fog::Service
 
       requires :aws_access_key_id, :aws_secret_access_key
 

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

@@ -2,7 +2,7 @@ require 'fog/model'
 
 module Fog
   module AWS
-    module EC2
+    class EC2
 
       class Address < Fog::Model
 

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

@@ -3,15 +3,7 @@ require 'fog/aws/models/ec2/address'
 
 module Fog
   module AWS
-    module EC2
-
-      module Collections
-        def addresses(attributes = {})
-          Fog::AWS::EC2::Addresses.new({
-            :connection => self
-          }.merge!(attributes))
-        end
-      end
+    class EC2
 
       class Addresses < Fog::Collection
 

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

@@ -2,7 +2,7 @@ require 'fog/model'
 
 module Fog
   module AWS
-    module EC2
+    class EC2
 
       class Flavor < Fog::Model
 
@@ -18,4 +18,4 @@ module Fog
 
     end
   end
-end
+end

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

@@ -3,13 +3,7 @@ require 'fog/aws/models/ec2/flavor'
 
 module Fog
   module AWS
-    module EC2
-
-      module Collections
-        def flavors
-          Fog::AWS::EC2::Flavors.new(:connection => self)
-        end
-      end
+    class EC2
 
       class Flavors < Fog::Collection
 

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

@@ -2,7 +2,7 @@ require 'fog/model'
 
 module Fog
   module AWS
-    module EC2
+    class EC2
 
       class Image < Fog::Model
 

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

@@ -3,13 +3,7 @@ require 'fog/aws/models/ec2/image'
 
 module Fog
   module AWS
-    module EC2
-
-      module Collections
-        def images
-          Fog::AWS::EC2::Images.new(:connection => self)
-        end
-      end
+    class EC2
 
       class Images < Fog::Collection
 

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

@@ -2,7 +2,7 @@ require 'fog/model'
 
 module Fog
   module AWS
-    module EC2
+    class EC2
 
       class KeyPair < Fog::Model
 

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

@@ -3,13 +3,7 @@ require 'fog/aws/models/ec2/key_pair'
 
 module Fog
   module AWS
-    module EC2
-
-      module Collections
-        def key_pairs
-          Fog::AWS::EC2::KeyPairs.new(:connection => self)
-        end
-      end
+    class EC2
 
       class KeyPairs < Fog::Collection
 

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

@@ -2,7 +2,7 @@ require 'fog/model'
 
 module Fog
   module AWS
-    module EC2
+    class EC2
 
       class SecurityGroup < Fog::Model
 

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

@@ -3,13 +3,7 @@ require 'fog/aws/models/ec2/security_group'
 
 module Fog
   module AWS
-    module EC2
-
-      module Collections
-        def security_groups
-          Fog::AWS::EC2::SecurityGroups.new(:connection => self)
-        end
-      end
+    class EC2
 
       class SecurityGroups < Fog::Collection
 

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

@@ -2,7 +2,7 @@ require 'fog/model'
 
 module Fog
   module AWS
-    module EC2
+    class EC2
 
       class Server < Fog::Model
 

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

@@ -3,13 +3,7 @@ require 'fog/aws/models/ec2/server'
 
 module Fog
   module AWS
-    module EC2
-
-      module Collections
-        def servers
-          Fog::AWS::EC2::Servers.new(:connection => self)
-        end
-      end
+    class EC2
 
       class Servers < Fog::Collection
 

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

@@ -2,7 +2,7 @@ require 'fog/model'
 
 module Fog
   module AWS
-    module EC2
+    class EC2
 
       class Snapshot < Fog::Model
         extend Fog::Deprecation

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

@@ -3,15 +3,7 @@ require 'fog/aws/models/ec2/snapshot'
 
 module Fog
   module AWS
-    module EC2
-
-      module Collections
-        def snapshots(attributes = {})
-          Fog::AWS::EC2::Snapshots.new({
-            :connection => self
-          }.merge!(attributes))
-        end
-      end
+    class EC2
 
       class Snapshots < Fog::Collection
 

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

@@ -2,7 +2,7 @@ require 'fog/model'
 
 module Fog
   module AWS
-    module EC2
+    class EC2
 
       class Volume < Fog::Model
         extend Fog::Deprecation

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

@@ -3,15 +3,7 @@ require 'fog/aws/models/ec2/volume'
 
 module Fog
   module AWS
-    module EC2
-
-      module Collections
-        def volumes(attributes = {})
-          Fog::AWS::EC2::Volumes.new({
-            :connection => self
-          }.merge!(attributes))
-        end
-      end
+    class EC2
 
       class Volumes < Fog::Collection
 

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

@@ -3,13 +3,7 @@ require 'fog/aws/models/s3/directory'
 
 module Fog
   module AWS
-    module S3
-
-      module Collections
-        def directories
-          Fog::AWS::S3::Directories.new(:connection => self)
-        end
-      end
+    class S3
 
       class Directories < Fog::Collection
 

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

@@ -3,7 +3,7 @@ require 'fog/aws/models/s3/files'
 
 module Fog
   module AWS
-    module S3
+    class S3
 
       class Directory < Fog::Model
         extend Fog::Deprecation

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

@@ -2,7 +2,7 @@ require 'fog/model'
 
 module Fog
   module AWS
-    module S3
+    class S3
 
       class File < Fog::Model
 

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

@@ -3,13 +3,7 @@ require 'fog/aws/models/s3/file'
 
 module Fog
   module AWS
-    module S3
-
-      module Collections
-        def files
-          Fog::AWS::S3::Files.new(:connection => self)
-        end
-      end
+    class S3
 
       class Files < Fog::Collection
 

lib/fog/aws/requests/ec2/allocate_address.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/allocate_address'

lib/fog/aws/requests/ec2/associate_address.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         # Associate an elastic IP address with an instance

lib/fog/aws/requests/ec2/attach_volume.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/attach_volume'

lib/fog/aws/requests/ec2/authorize_security_group_ingress.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         # Add permissions to a security group

lib/fog/aws/requests/ec2/create_image.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/create_image'

lib/fog/aws/requests/ec2/create_key_pair.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/create_key_pair'

lib/fog/aws/requests/ec2/create_security_group.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         # Create a new security group

lib/fog/aws/requests/ec2/create_snapshot.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/create_snapshot'

lib/fog/aws/requests/ec2/create_volume.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/create_volume'

lib/fog/aws/requests/ec2/delete_key_pair.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         # Delete a key pair that you own

lib/fog/aws/requests/ec2/delete_security_group.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         # Delete a security group that you own

lib/fog/aws/requests/ec2/delete_snapshot.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         # Delete a snapshot of an EBS volume that you own

lib/fog/aws/requests/ec2/delete_volume.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         # Delete an EBS volume

lib/fog/aws/requests/ec2/deregister_image.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/deregister_image'

lib/fog/aws/requests/ec2/describe_addresses.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/describe_addresses'

lib/fog/aws/requests/ec2/describe_availability_zones.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/describe_availability_zones'

lib/fog/aws/requests/ec2/describe_images.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/describe_images'

lib/fog/aws/requests/ec2/describe_instances.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/describe_instances'

lib/fog/aws/requests/ec2/describe_key_pairs.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/describe_key_pairs'

lib/fog/aws/requests/ec2/describe_regions.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/describe_regions'

lib/fog/aws/requests/ec2/describe_reserved_instances.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/describe_reserved_instances'

lib/fog/aws/requests/ec2/describe_security_groups.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/describe_security_groups'

lib/fog/aws/requests/ec2/describe_snapshots.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/describe_snapshots'

lib/fog/aws/requests/ec2/describe_volumes.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/describe_volumes'

lib/fog/aws/requests/ec2/detach_volume.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/detach_volume'

lib/fog/aws/requests/ec2/disassociate_address.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         # Disassociate an elastic IP address from its instance (if any)

lib/fog/aws/requests/ec2/get_console_output.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/get_console_output'

lib/fog/aws/requests/ec2/modify_image_attributes.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         # Modify image attributes

lib/fog/aws/requests/ec2/modify_snapshot_attribute.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         # Modify snapshot attributes

lib/fog/aws/requests/ec2/reboot_instances.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         # Reboot specified instances

lib/fog/aws/requests/ec2/register_image.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/register_image'

lib/fog/aws/requests/ec2/release_address.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         # Release an elastic IP address.

lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         # Remove permissions from a security group

lib/fog/aws/requests/ec2/run_instances.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/run_instances'

lib/fog/aws/requests/ec2/start_instances.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/start_stop_instances'

lib/fog/aws/requests/ec2/stop_instances.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/start_stop_instances'

lib/fog/aws/requests/ec2/terminate_instances.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module EC2
+    class EC2
       class Real
 
         require 'fog/aws/parsers/ec2/terminate_instances'

lib/fog/aws/requests/elb/create_load_balancer.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module ELB
+    class ELB
       class Real
 
         require 'fog/aws/parsers/elb/create_load_balancer'

lib/fog/aws/requests/elb/delete_load_balancer.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module ELB
+    class ELB
       class Real
 
         require 'fog/aws/parsers/elb/delete_load_balancer'

lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module ELB
+    class ELB
       class Real
 
         require 'fog/aws/parsers/elb/deregister_instances_from_load_balancer'

lib/fog/aws/requests/elb/describe_instance_health.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module ELB
+    class ELB
       class Real
 
         require 'fog/aws/parsers/elb/describe_instance_health'

lib/fog/aws/requests/elb/describe_load_balancers.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module ELB
+    class ELB
       class Real
 
         require 'fog/aws/parsers/elb/describe_load_balancers'

lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module ELB
+    class ELB
       class Real
 
         require 'fog/aws/parsers/elb/disable_availability_zones_for_load_balancer'

lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module ELB
+    class ELB
       class Real
 
         require 'fog/aws/parsers/elb/enable_availability_zones_for_load_balancer'

lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module ELB
+    class ELB
       class Real
 
         require 'fog/aws/parsers/elb/register_instances_with_load_balancer'

lib/fog/aws/requests/s3/copy_object.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         require 'fog/aws/parsers/s3/copy_object'

lib/fog/aws/requests/s3/delete_bucket.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         # Delete an S3 bucket

lib/fog/aws/requests/s3/delete_object.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         # Delete an object from S3
@@ -42,4 +42,4 @@ module Fog
       end
     end
   end
-end
+end

lib/fog/aws/requests/s3/get_bucket.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         require 'fog/aws/parsers/s3/get_bucket'

lib/fog/aws/requests/s3/get_bucket_acl.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         require 'fog/aws/parsers/s3/access_control_list'

lib/fog/aws/requests/s3/get_bucket_location.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         require 'fog/aws/parsers/s3/get_bucket_location'

lib/fog/aws/requests/s3/get_bucket_logging.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         require 'fog/aws/parsers/s3/get_bucket_logging'

lib/fog/aws/requests/s3/get_bucket_object_versions.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         require 'fog/aws/parsers/s3/get_bucket_object_versions'

lib/fog/aws/requests/s3/get_bucket_versioning.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         require 'fog/aws/parsers/s3/get_bucket_versioning'

lib/fog/aws/requests/s3/get_object.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         # Get an object from S3

lib/fog/aws/requests/s3/get_object_acl.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         require 'fog/aws/parsers/s3/access_control_list'

lib/fog/aws/requests/s3/get_object_torrent.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         # Get torrent for an S3 object

lib/fog/aws/requests/s3/get_object_url.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         # Get an expiring object url from S3

lib/fog/aws/requests/s3/get_request_payment.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         require 'fog/aws/parsers/s3/get_request_payment'

lib/fog/aws/requests/s3/get_service.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         require 'fog/aws/parsers/s3/get_service'

lib/fog/aws/requests/s3/head_object.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         # Get headers for an object from S3

lib/fog/aws/requests/s3/put_bucket.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         # Create an S3 bucket

lib/fog/aws/requests/s3/put_bucket_acl.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         # Change access control list for an S3 bucket

lib/fog/aws/requests/s3/put_bucket_logging.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         # Change logging status for an S3 bucket

lib/fog/aws/requests/s3/put_bucket_versioning.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         # Change versioning status for an S3 bucket

lib/fog/aws/requests/s3/put_object.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         # Create an object in an S3 bucket

lib/fog/aws/requests/s3/put_object_url.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         # Get an expiring object url from S3 for putting an object

lib/fog/aws/requests/s3/put_request_payment.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class S3
       class Real
 
         # Change who pays for requests to an S3 bucket

lib/fog/aws/requests/simpledb/batch_put_attributes.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module SimpleDB
+    class SimpleDB
       class Real
 
         # Put items attributes into a SimpleDB domain

lib/fog/aws/requests/simpledb/create_domain.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module SimpleDB
+    class SimpleDB
       class Real
 
         # Create a SimpleDB domain

lib/fog/aws/requests/simpledb/delete_attributes.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module SimpleDB
+    class SimpleDB
       class Real
 
         # List metadata for SimpleDB domain

lib/fog/aws/requests/simpledb/delete_domain.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module SimpleDB
+    class SimpleDB
       class Real
 
         # Delete a SimpleDB domain

lib/fog/aws/requests/simpledb/domain_metadata.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module SimpleDB
+    class SimpleDB
       class Real
 
         require 'fog/aws/parsers/simpledb/domain_metadata'

lib/fog/aws/requests/simpledb/get_attributes.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module SimpleDB
+    class SimpleDB
       class Real
 
         require 'fog/aws/parsers/simpledb/get_attributes'

lib/fog/aws/requests/simpledb/list_domains.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module SimpleDB
+    class SimpleDB
       class Real
 
         require 'fog/aws/parsers/simpledb/list_domains'

lib/fog/aws/requests/simpledb/put_attributes.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module SimpleDB
+    class SimpleDB
       class Real
 
         # Put item attributes into a SimpleDB domain