diff --git a/lib/fog/aws.rb b/lib/fog/aws.rb
index 907c5193b..449c2a86c 100644
--- a/lib/fog/aws.rb
+++ b/lib/fog/aws.rb
@@ -10,7 +10,7 @@ module Fog
 
     service(:cdn,       'aws/cdn')
     service(:compute,   'aws/compute')
-    service(:dns,       'aws/dns')
+    service(:dns,       'dns/aws')
     service(:ec2,       'aws/ec2')
     service(:elb,       'aws/elb')
     service(:iam,       'aws/iam')
diff --git a/lib/fog/core.rb b/lib/fog/core.rb
index 32ad7ceb3..3f4c2beee 100644
--- a/lib/fog/core.rb
+++ b/lib/fog/core.rb
@@ -20,7 +20,6 @@ require 'fog/core/compute'
 require 'fog/core/connection'
 require 'fog/core/credentials'
 require 'fog/core/deprecation'
-require 'fog/core/dns'
 require 'fog/core/errors'
 require 'fog/core/hmac'
 require 'fog/core/model'
diff --git a/lib/fog/core/dns.rb b/lib/fog/dns.rb
similarity index 88%
rename from lib/fog/core/dns.rb
rename to lib/fog/dns.rb
index 413061927..f5f8bda97 100644
--- a/lib/fog/core/dns.rb
+++ b/lib/fog/dns.rb
@@ -1,3 +1,8 @@
+require 'fog/aws'
+require 'fog/linode'
+require 'fog/slicehost'
+require 'fog/zerigo'
+
 module Fog
   class DNS
 
diff --git a/lib/fog/aws/dns.rb b/lib/fog/dns/aws.rb
similarity index 97%
rename from lib/fog/aws/dns.rb
rename to lib/fog/dns/aws.rb
index 09a9a553c..025f67a66 100644
--- a/lib/fog/aws/dns.rb
+++ b/lib/fog/dns/aws.rb
@@ -5,13 +5,13 @@ module Fog
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :host, :path, :port, :scheme, :version, :persistent
 
-      model_path 'fog/aws/models/dns'
+      model_path 'fog/dns/models/aws'
       model       :record
       collection  :records
       model       :zone
       collection  :zones
 
-      request_path 'fog/aws/requests/dns'
+      request_path 'fog/dns/requests/aws'
       request :create_hosted_zone
       request :get_hosted_zone
       request :delete_hosted_zone
diff --git a/lib/fog/linode/dns.rb b/lib/fog/dns/linode.rb
similarity index 95%
rename from lib/fog/linode/dns.rb
rename to lib/fog/dns/linode.rb
index eea24fc3d..efd922ec9 100644
--- a/lib/fog/linode/dns.rb
+++ b/lib/fog/dns/linode.rb
@@ -5,13 +5,13 @@ module Fog
       requires :linode_api_key
       recognizes :port, :scheme, :persistent
 
-      model_path 'fog/linode/models/dns'
+      model_path 'fog/dns/models/linode'
       model       :record
       collection  :records
       model       :zone
       collection  :zones
 
-      request_path 'fog/linode/requests/dns'
+      request_path 'fog/dns/models/linode'
       request :domain_create
       request :domain_delete
       request :domain_list
diff --git a/lib/fog/aws/models/dns/record.rb b/lib/fog/dns/models/aws/record.rb
similarity index 100%
rename from lib/fog/aws/models/dns/record.rb
rename to lib/fog/dns/models/aws/record.rb
diff --git a/lib/fog/aws/models/dns/records.rb b/lib/fog/dns/models/aws/records.rb
similarity index 100%
rename from lib/fog/aws/models/dns/records.rb
rename to lib/fog/dns/models/aws/records.rb
diff --git a/lib/fog/aws/models/dns/zone.rb b/lib/fog/dns/models/aws/zone.rb
similarity index 100%
rename from lib/fog/aws/models/dns/zone.rb
rename to lib/fog/dns/models/aws/zone.rb
diff --git a/lib/fog/aws/models/dns/zones.rb b/lib/fog/dns/models/aws/zones.rb
similarity index 100%
rename from lib/fog/aws/models/dns/zones.rb
rename to lib/fog/dns/models/aws/zones.rb
diff --git a/lib/fog/linode/models/dns/record.rb b/lib/fog/dns/models/linode/record.rb
similarity index 100%
rename from lib/fog/linode/models/dns/record.rb
rename to lib/fog/dns/models/linode/record.rb
diff --git a/lib/fog/linode/models/dns/records.rb b/lib/fog/dns/models/linode/records.rb
similarity index 100%
rename from lib/fog/linode/models/dns/records.rb
rename to lib/fog/dns/models/linode/records.rb
diff --git a/lib/fog/linode/models/dns/zone.rb b/lib/fog/dns/models/linode/zone.rb
similarity index 100%
rename from lib/fog/linode/models/dns/zone.rb
rename to lib/fog/dns/models/linode/zone.rb
diff --git a/lib/fog/linode/models/dns/zones.rb b/lib/fog/dns/models/linode/zones.rb
similarity index 100%
rename from lib/fog/linode/models/dns/zones.rb
rename to lib/fog/dns/models/linode/zones.rb
diff --git a/lib/fog/slicehost/models/dns/record.rb b/lib/fog/dns/models/slicehost/record.rb
similarity index 100%
rename from lib/fog/slicehost/models/dns/record.rb
rename to lib/fog/dns/models/slicehost/record.rb
diff --git a/lib/fog/slicehost/models/dns/records.rb b/lib/fog/dns/models/slicehost/records.rb
similarity index 100%
rename from lib/fog/slicehost/models/dns/records.rb
rename to lib/fog/dns/models/slicehost/records.rb
diff --git a/lib/fog/slicehost/models/dns/zone.rb b/lib/fog/dns/models/slicehost/zone.rb
similarity index 100%
rename from lib/fog/slicehost/models/dns/zone.rb
rename to lib/fog/dns/models/slicehost/zone.rb
diff --git a/lib/fog/slicehost/models/dns/zones.rb b/lib/fog/dns/models/slicehost/zones.rb
similarity index 100%
rename from lib/fog/slicehost/models/dns/zones.rb
rename to lib/fog/dns/models/slicehost/zones.rb
diff --git a/lib/fog/zerigo/models/dns/record.rb b/lib/fog/dns/models/zerigo/record.rb
similarity index 100%
rename from lib/fog/zerigo/models/dns/record.rb
rename to lib/fog/dns/models/zerigo/record.rb
diff --git a/lib/fog/zerigo/models/dns/records.rb b/lib/fog/dns/models/zerigo/records.rb
similarity index 100%
rename from lib/fog/zerigo/models/dns/records.rb
rename to lib/fog/dns/models/zerigo/records.rb
diff --git a/lib/fog/zerigo/models/dns/zone.rb b/lib/fog/dns/models/zerigo/zone.rb
similarity index 100%
rename from lib/fog/zerigo/models/dns/zone.rb
rename to lib/fog/dns/models/zerigo/zone.rb
diff --git a/lib/fog/zerigo/models/dns/zones.rb b/lib/fog/dns/models/zerigo/zones.rb
similarity index 100%
rename from lib/fog/zerigo/models/dns/zones.rb
rename to lib/fog/dns/models/zerigo/zones.rb
diff --git a/lib/fog/aws/parsers/dns/change_resource_record_sets.rb b/lib/fog/dns/parsers/aws/change_resource_record_sets.rb
similarity index 100%
rename from lib/fog/aws/parsers/dns/change_resource_record_sets.rb
rename to lib/fog/dns/parsers/aws/change_resource_record_sets.rb
diff --git a/lib/fog/aws/parsers/dns/create_hosted_zone.rb b/lib/fog/dns/parsers/aws/create_hosted_zone.rb
similarity index 100%
rename from lib/fog/aws/parsers/dns/create_hosted_zone.rb
rename to lib/fog/dns/parsers/aws/create_hosted_zone.rb
diff --git a/lib/fog/aws/parsers/dns/delete_hosted_zone.rb b/lib/fog/dns/parsers/aws/delete_hosted_zone.rb
similarity index 100%
rename from lib/fog/aws/parsers/dns/delete_hosted_zone.rb
rename to lib/fog/dns/parsers/aws/delete_hosted_zone.rb
diff --git a/lib/fog/aws/parsers/dns/get_change.rb b/lib/fog/dns/parsers/aws/get_change.rb
similarity index 100%
rename from lib/fog/aws/parsers/dns/get_change.rb
rename to lib/fog/dns/parsers/aws/get_change.rb
diff --git a/lib/fog/aws/parsers/dns/get_hosted_zone.rb b/lib/fog/dns/parsers/aws/get_hosted_zone.rb
similarity index 100%
rename from lib/fog/aws/parsers/dns/get_hosted_zone.rb
rename to lib/fog/dns/parsers/aws/get_hosted_zone.rb
diff --git a/lib/fog/aws/parsers/dns/list_hosted_zones.rb b/lib/fog/dns/parsers/aws/list_hosted_zones.rb
similarity index 100%
rename from lib/fog/aws/parsers/dns/list_hosted_zones.rb
rename to lib/fog/dns/parsers/aws/list_hosted_zones.rb
diff --git a/lib/fog/aws/parsers/dns/list_resource_record_sets.rb b/lib/fog/dns/parsers/aws/list_resource_record_sets.rb
similarity index 100%
rename from lib/fog/aws/parsers/dns/list_resource_record_sets.rb
rename to lib/fog/dns/parsers/aws/list_resource_record_sets.rb
diff --git a/lib/fog/slicehost/parsers/dns/create_record.rb b/lib/fog/dns/parsers/slicehost/create_record.rb
similarity index 100%
rename from lib/fog/slicehost/parsers/dns/create_record.rb
rename to lib/fog/dns/parsers/slicehost/create_record.rb
diff --git a/lib/fog/slicehost/parsers/dns/create_zone.rb b/lib/fog/dns/parsers/slicehost/create_zone.rb
similarity index 100%
rename from lib/fog/slicehost/parsers/dns/create_zone.rb
rename to lib/fog/dns/parsers/slicehost/create_zone.rb
diff --git a/lib/fog/slicehost/parsers/dns/get_record.rb b/lib/fog/dns/parsers/slicehost/get_record.rb
similarity index 100%
rename from lib/fog/slicehost/parsers/dns/get_record.rb
rename to lib/fog/dns/parsers/slicehost/get_record.rb
diff --git a/lib/fog/slicehost/parsers/dns/get_records.rb b/lib/fog/dns/parsers/slicehost/get_records.rb
similarity index 100%
rename from lib/fog/slicehost/parsers/dns/get_records.rb
rename to lib/fog/dns/parsers/slicehost/get_records.rb
diff --git a/lib/fog/slicehost/parsers/dns/get_zone.rb b/lib/fog/dns/parsers/slicehost/get_zone.rb
similarity index 100%
rename from lib/fog/slicehost/parsers/dns/get_zone.rb
rename to lib/fog/dns/parsers/slicehost/get_zone.rb
diff --git a/lib/fog/slicehost/parsers/dns/get_zones.rb b/lib/fog/dns/parsers/slicehost/get_zones.rb
similarity index 100%
rename from lib/fog/slicehost/parsers/dns/get_zones.rb
rename to lib/fog/dns/parsers/slicehost/get_zones.rb
diff --git a/lib/fog/zerigo/parsers/dns/count_hosts.rb b/lib/fog/dns/parsers/zerigo/count_hosts.rb
similarity index 100%
rename from lib/fog/zerigo/parsers/dns/count_hosts.rb
rename to lib/fog/dns/parsers/zerigo/count_hosts.rb
diff --git a/lib/fog/zerigo/parsers/dns/count_zones.rb b/lib/fog/dns/parsers/zerigo/count_zones.rb
similarity index 100%
rename from lib/fog/zerigo/parsers/dns/count_zones.rb
rename to lib/fog/dns/parsers/zerigo/count_zones.rb
diff --git a/lib/fog/zerigo/parsers/dns/create_host.rb b/lib/fog/dns/parsers/zerigo/create_host.rb
similarity index 100%
rename from lib/fog/zerigo/parsers/dns/create_host.rb
rename to lib/fog/dns/parsers/zerigo/create_host.rb
diff --git a/lib/fog/zerigo/parsers/dns/create_zone.rb b/lib/fog/dns/parsers/zerigo/create_zone.rb
similarity index 100%
rename from lib/fog/zerigo/parsers/dns/create_zone.rb
rename to lib/fog/dns/parsers/zerigo/create_zone.rb
diff --git a/lib/fog/zerigo/parsers/dns/find_hosts.rb b/lib/fog/dns/parsers/zerigo/find_hosts.rb
similarity index 100%
rename from lib/fog/zerigo/parsers/dns/find_hosts.rb
rename to lib/fog/dns/parsers/zerigo/find_hosts.rb
diff --git a/lib/fog/zerigo/parsers/dns/get_host.rb b/lib/fog/dns/parsers/zerigo/get_host.rb
similarity index 100%
rename from lib/fog/zerigo/parsers/dns/get_host.rb
rename to lib/fog/dns/parsers/zerigo/get_host.rb
diff --git a/lib/fog/zerigo/parsers/dns/get_zone.rb b/lib/fog/dns/parsers/zerigo/get_zone.rb
similarity index 100%
rename from lib/fog/zerigo/parsers/dns/get_zone.rb
rename to lib/fog/dns/parsers/zerigo/get_zone.rb
diff --git a/lib/fog/zerigo/parsers/dns/get_zone_stats.rb b/lib/fog/dns/parsers/zerigo/get_zone_stats.rb
similarity index 100%
rename from lib/fog/zerigo/parsers/dns/get_zone_stats.rb
rename to lib/fog/dns/parsers/zerigo/get_zone_stats.rb
diff --git a/lib/fog/zerigo/parsers/dns/list_hosts.rb b/lib/fog/dns/parsers/zerigo/list_hosts.rb
similarity index 100%
rename from lib/fog/zerigo/parsers/dns/list_hosts.rb
rename to lib/fog/dns/parsers/zerigo/list_hosts.rb
diff --git a/lib/fog/zerigo/parsers/dns/list_zones.rb b/lib/fog/dns/parsers/zerigo/list_zones.rb
similarity index 100%
rename from lib/fog/zerigo/parsers/dns/list_zones.rb
rename to lib/fog/dns/parsers/zerigo/list_zones.rb
diff --git a/lib/fog/aws/requests/dns/change_resource_record_sets.rb b/lib/fog/dns/requests/aws/change_resource_record_sets.rb
similarity index 98%
rename from lib/fog/aws/requests/dns/change_resource_record_sets.rb
rename to lib/fog/dns/requests/aws/change_resource_record_sets.rb
index e812b68ee..218be2569 100644
--- a/lib/fog/aws/requests/dns/change_resource_record_sets.rb
+++ b/lib/fog/dns/requests/aws/change_resource_record_sets.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/aws/parsers/dns/change_resource_record_sets'
+        require 'fog/dns/parsers/aws/change_resource_record_sets'
 
         # Use this action to create or change your authoritative DNS information for a zone
         #
diff --git a/lib/fog/aws/requests/dns/create_hosted_zone.rb b/lib/fog/dns/requests/aws/create_hosted_zone.rb
similarity index 97%
rename from lib/fog/aws/requests/dns/create_hosted_zone.rb
rename to lib/fog/dns/requests/aws/create_hosted_zone.rb
index 70ce9509a..eac2ae4c6 100644
--- a/lib/fog/aws/requests/dns/create_hosted_zone.rb
+++ b/lib/fog/dns/requests/aws/create_hosted_zone.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/aws/parsers/dns/create_hosted_zone'
+        require 'fog/dns/parsers/aws/create_hosted_zone'
 
         # Creates a new hosted zone
         #
diff --git a/lib/fog/aws/requests/dns/delete_hosted_zone.rb b/lib/fog/dns/requests/aws/delete_hosted_zone.rb
similarity index 95%
rename from lib/fog/aws/requests/dns/delete_hosted_zone.rb
rename to lib/fog/dns/requests/aws/delete_hosted_zone.rb
index 69b043136..b0f2f9cde 100644
--- a/lib/fog/aws/requests/dns/delete_hosted_zone.rb
+++ b/lib/fog/dns/requests/aws/delete_hosted_zone.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/aws/parsers/dns/delete_hosted_zone'
+        require 'fog/dns/parsers/aws/delete_hosted_zone'
 
         # Delete a hosted zone
         #
diff --git a/lib/fog/aws/requests/dns/get_change.rb b/lib/fog/dns/requests/aws/get_change.rb
similarity index 95%
rename from lib/fog/aws/requests/dns/get_change.rb
rename to lib/fog/dns/requests/aws/get_change.rb
index 3da2b15bf..15ebe1ee6 100644
--- a/lib/fog/aws/requests/dns/get_change.rb
+++ b/lib/fog/dns/requests/aws/get_change.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/aws/parsers/dns/get_change'
+        require 'fog/dns/parsers/aws/get_change'
 
         # returns the current state of a change request
         #
diff --git a/lib/fog/aws/requests/dns/get_hosted_zone.rb b/lib/fog/dns/requests/aws/get_hosted_zone.rb
similarity index 95%
rename from lib/fog/aws/requests/dns/get_hosted_zone.rb
rename to lib/fog/dns/requests/aws/get_hosted_zone.rb
index 07033275c..c2bad4068 100644
--- a/lib/fog/aws/requests/dns/get_hosted_zone.rb
+++ b/lib/fog/dns/requests/aws/get_hosted_zone.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/aws/parsers/dns/get_hosted_zone'
+        require 'fog/dns/parsers/aws/get_hosted_zone'
 
         # retrieve information about a hosted zone
         #
diff --git a/lib/fog/aws/requests/dns/list_hosted_zones.rb b/lib/fog/dns/requests/aws/list_hosted_zones.rb
similarity index 96%
rename from lib/fog/aws/requests/dns/list_hosted_zones.rb
rename to lib/fog/dns/requests/aws/list_hosted_zones.rb
index 06760bff1..bb6bf5962 100644
--- a/lib/fog/aws/requests/dns/list_hosted_zones.rb
+++ b/lib/fog/dns/requests/aws/list_hosted_zones.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/aws/parsers/dns/list_hosted_zones'
+        require 'fog/dns/parsers/aws/list_hosted_zones'
 
         # Describe all or specified instances
         #
diff --git a/lib/fog/aws/requests/dns/list_resource_record_sets.rb b/lib/fog/dns/requests/aws/list_resource_record_sets.rb
similarity index 96%
rename from lib/fog/aws/requests/dns/list_resource_record_sets.rb
rename to lib/fog/dns/requests/aws/list_resource_record_sets.rb
index 9f795f1d2..86007d4d8 100644
--- a/lib/fog/aws/requests/dns/list_resource_record_sets.rb
+++ b/lib/fog/dns/requests/aws/list_resource_record_sets.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/aws/parsers/dns/list_resource_record_sets'
+        require 'fog/dns/parsers/aws/list_resource_record_sets'
 
         # list your resource record sets
         #
diff --git a/lib/fog/linode/requests/dns/domain_create.rb b/lib/fog/dns/requests/linode/domain_create.rb
similarity index 100%
rename from lib/fog/linode/requests/dns/domain_create.rb
rename to lib/fog/dns/requests/linode/domain_create.rb
diff --git a/lib/fog/linode/requests/dns/domain_delete.rb b/lib/fog/dns/requests/linode/domain_delete.rb
similarity index 100%
rename from lib/fog/linode/requests/dns/domain_delete.rb
rename to lib/fog/dns/requests/linode/domain_delete.rb
diff --git a/lib/fog/linode/requests/dns/domain_list.rb b/lib/fog/dns/requests/linode/domain_list.rb
similarity index 100%
rename from lib/fog/linode/requests/dns/domain_list.rb
rename to lib/fog/dns/requests/linode/domain_list.rb
diff --git a/lib/fog/linode/requests/dns/domain_resource_create.rb b/lib/fog/dns/requests/linode/domain_resource_create.rb
similarity index 100%
rename from lib/fog/linode/requests/dns/domain_resource_create.rb
rename to lib/fog/dns/requests/linode/domain_resource_create.rb
diff --git a/lib/fog/linode/requests/dns/domain_resource_delete.rb b/lib/fog/dns/requests/linode/domain_resource_delete.rb
similarity index 100%
rename from lib/fog/linode/requests/dns/domain_resource_delete.rb
rename to lib/fog/dns/requests/linode/domain_resource_delete.rb
diff --git a/lib/fog/linode/requests/dns/domain_resource_list.rb b/lib/fog/dns/requests/linode/domain_resource_list.rb
similarity index 100%
rename from lib/fog/linode/requests/dns/domain_resource_list.rb
rename to lib/fog/dns/requests/linode/domain_resource_list.rb
diff --git a/lib/fog/linode/requests/dns/domain_resource_update.rb b/lib/fog/dns/requests/linode/domain_resource_update.rb
similarity index 100%
rename from lib/fog/linode/requests/dns/domain_resource_update.rb
rename to lib/fog/dns/requests/linode/domain_resource_update.rb
diff --git a/lib/fog/linode/requests/dns/domain_update.rb b/lib/fog/dns/requests/linode/domain_update.rb
similarity index 100%
rename from lib/fog/linode/requests/dns/domain_update.rb
rename to lib/fog/dns/requests/linode/domain_update.rb
diff --git a/lib/fog/slicehost/requests/dns/create_record.rb b/lib/fog/dns/requests/slicehost/create_record.rb
similarity index 97%
rename from lib/fog/slicehost/requests/dns/create_record.rb
rename to lib/fog/dns/requests/slicehost/create_record.rb
index bf048e08d..67c9e9f82 100644
--- a/lib/fog/slicehost/requests/dns/create_record.rb
+++ b/lib/fog/dns/requests/slicehost/create_record.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/slicehost/parsers/dns/create_record'
+        require 'fog/dns/parsers/slicehost/create_record'
 
         # Create a new record in a DNS zone - or update an existing one
         # ==== Parameters
diff --git a/lib/fog/slicehost/requests/dns/create_zone.rb b/lib/fog/dns/requests/slicehost/create_zone.rb
similarity index 96%
rename from lib/fog/slicehost/requests/dns/create_zone.rb
rename to lib/fog/dns/requests/slicehost/create_zone.rb
index 4c78eec94..eb816090b 100644
--- a/lib/fog/slicehost/requests/dns/create_zone.rb
+++ b/lib/fog/dns/requests/slicehost/create_zone.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/slicehost/parsers/dns/create_zone'
+        require 'fog/dns/parsers/slicehost/create_zone'
 
         # Create a new zone for Slicehost's DNS servers to serve/host
         # ==== Parameters
diff --git a/lib/fog/slicehost/requests/dns/delete_record.rb b/lib/fog/dns/requests/slicehost/delete_record.rb
similarity index 100%
rename from lib/fog/slicehost/requests/dns/delete_record.rb
rename to lib/fog/dns/requests/slicehost/delete_record.rb
diff --git a/lib/fog/slicehost/requests/dns/delete_zone.rb b/lib/fog/dns/requests/slicehost/delete_zone.rb
similarity index 100%
rename from lib/fog/slicehost/requests/dns/delete_zone.rb
rename to lib/fog/dns/requests/slicehost/delete_zone.rb
diff --git a/lib/fog/slicehost/requests/dns/get_record.rb b/lib/fog/dns/requests/slicehost/get_record.rb
similarity index 95%
rename from lib/fog/slicehost/requests/dns/get_record.rb
rename to lib/fog/dns/requests/slicehost/get_record.rb
index 6cf0f8469..0ed9823c3 100644
--- a/lib/fog/slicehost/requests/dns/get_record.rb
+++ b/lib/fog/dns/requests/slicehost/get_record.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/slicehost/parsers/dns/get_record'
+        require 'fog/dns/parsers/slicehost/get_record'
 
         # Get an individual DNS record from the specified zone 
         #
diff --git a/lib/fog/slicehost/requests/dns/get_records.rb b/lib/fog/dns/requests/slicehost/get_records.rb
similarity index 95%
rename from lib/fog/slicehost/requests/dns/get_records.rb
rename to lib/fog/dns/requests/slicehost/get_records.rb
index b990297ef..c77bb8521 100644
--- a/lib/fog/slicehost/requests/dns/get_records.rb
+++ b/lib/fog/dns/requests/slicehost/get_records.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/slicehost/parsers/dns/get_records'
+        require 'fog/dns/parsers/slicehost/get_records'
 
         # Get all the DNS records across all the DNS zones for this account 
         #
diff --git a/lib/fog/slicehost/requests/dns/get_zone.rb b/lib/fog/dns/requests/slicehost/get_zone.rb
similarity index 94%
rename from lib/fog/slicehost/requests/dns/get_zone.rb
rename to lib/fog/dns/requests/slicehost/get_zone.rb
index e4d6d6055..7805845d7 100644
--- a/lib/fog/slicehost/requests/dns/get_zone.rb
+++ b/lib/fog/dns/requests/slicehost/get_zone.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/slicehost/parsers/dns/get_zone'
+        require 'fog/dns/parsers/slicehost/get_zone'
 
         # Get details of a DNS zone
         #
diff --git a/lib/fog/slicehost/requests/dns/get_zones.rb b/lib/fog/dns/requests/slicehost/get_zones.rb
similarity index 94%
rename from lib/fog/slicehost/requests/dns/get_zones.rb
rename to lib/fog/dns/requests/slicehost/get_zones.rb
index ed8ca8580..8cb5a2acb 100644
--- a/lib/fog/slicehost/requests/dns/get_zones.rb
+++ b/lib/fog/dns/requests/slicehost/get_zones.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/slicehost/parsers/dns/get_zones'
+        require 'fog/dns/parsers/slicehost/get_zones'
 
         # Get list of all DNS zones hosted on Slicehost (for this account)
         #
diff --git a/lib/fog/zerigo/requests/dns/count_hosts.rb b/lib/fog/dns/requests/zerigo/count_hosts.rb
similarity index 94%
rename from lib/fog/zerigo/requests/dns/count_hosts.rb
rename to lib/fog/dns/requests/zerigo/count_hosts.rb
index 7cd7b1d56..b975d4e88 100644
--- a/lib/fog/zerigo/requests/dns/count_hosts.rb
+++ b/lib/fog/dns/requests/zerigo/count_hosts.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/zerigo/parsers/dns/count_hosts'
+        require 'fog/dns/parsers/zerigo/count_hosts'
 
         # total number of hosts available for the specified zone. It is the same value as provided 
         # in the X-Query-Count header in the list_hosts API method
diff --git a/lib/fog/zerigo/requests/dns/count_zones.rb b/lib/fog/dns/requests/zerigo/count_zones.rb
similarity index 93%
rename from lib/fog/zerigo/requests/dns/count_zones.rb
rename to lib/fog/dns/requests/zerigo/count_zones.rb
index 99fb9876e..b90d29cf2 100644
--- a/lib/fog/zerigo/requests/dns/count_zones.rb
+++ b/lib/fog/dns/requests/zerigo/count_zones.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/zerigo/parsers/dns/count_zones'
+        require 'fog/dns/parsers/zerigo/count_zones'
 
         # Total number of zones hosted Zerigo for this account. It is the same value as provided 
         # in the X-Query-Count header in the list_zones API method
diff --git a/lib/fog/zerigo/requests/dns/create_host.rb b/lib/fog/dns/requests/zerigo/create_host.rb
similarity index 97%
rename from lib/fog/zerigo/requests/dns/create_host.rb
rename to lib/fog/dns/requests/zerigo/create_host.rb
index bb053bb5f..b6574c243 100644
--- a/lib/fog/zerigo/requests/dns/create_host.rb
+++ b/lib/fog/dns/requests/zerigo/create_host.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/zerigo/parsers/dns/create_host'
+        require 'fog/dns/parsers/zerigo/create_host'
 
         # Create a new host in the specified zone
         #
diff --git a/lib/fog/zerigo/requests/dns/create_zone.rb b/lib/fog/dns/requests/zerigo/create_zone.rb
similarity index 98%
rename from lib/fog/zerigo/requests/dns/create_zone.rb
rename to lib/fog/dns/requests/zerigo/create_zone.rb
index 3555eebad..6326ce0a0 100644
--- a/lib/fog/zerigo/requests/dns/create_zone.rb
+++ b/lib/fog/dns/requests/zerigo/create_zone.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/zerigo/parsers/dns/create_zone'
+        require 'fog/dns/parsers/zerigo/create_zone'
 
         # Create a new zone for Zerigo's DNS servers to serve/host
         # ==== Parameters
diff --git a/lib/fog/zerigo/requests/dns/delete_host.rb b/lib/fog/dns/requests/zerigo/delete_host.rb
similarity index 100%
rename from lib/fog/zerigo/requests/dns/delete_host.rb
rename to lib/fog/dns/requests/zerigo/delete_host.rb
diff --git a/lib/fog/zerigo/requests/dns/delete_zone.rb b/lib/fog/dns/requests/zerigo/delete_zone.rb
similarity index 100%
rename from lib/fog/zerigo/requests/dns/delete_zone.rb
rename to lib/fog/dns/requests/zerigo/delete_zone.rb
diff --git a/lib/fog/zerigo/requests/dns/find_hosts.rb b/lib/fog/dns/requests/zerigo/find_hosts.rb
similarity index 97%
rename from lib/fog/zerigo/requests/dns/find_hosts.rb
rename to lib/fog/dns/requests/zerigo/find_hosts.rb
index d3c61c2a3..2eab60b71 100644
--- a/lib/fog/zerigo/requests/dns/find_hosts.rb
+++ b/lib/fog/dns/requests/zerigo/find_hosts.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/zerigo/parsers/dns/find_hosts'
+        require 'fog/dns/parsers/zerigo/find_hosts'
 
         # Get list of all the host records that match the FQDN.  If desired, can limit
         # search to a specific zone
diff --git a/lib/fog/zerigo/requests/dns/get_host.rb b/lib/fog/dns/requests/zerigo/get_host.rb
similarity index 95%
rename from lib/fog/zerigo/requests/dns/get_host.rb
rename to lib/fog/dns/requests/zerigo/get_host.rb
index c5c577775..31de853e7 100644
--- a/lib/fog/zerigo/requests/dns/get_host.rb
+++ b/lib/fog/dns/requests/zerigo/get_host.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/zerigo/parsers/dns/get_host'
+        require 'fog/dns/parsers/zerigo/get_host'
 
         # get details about a given host record
         #
diff --git a/lib/fog/zerigo/requests/dns/get_zone.rb b/lib/fog/dns/requests/zerigo/get_zone.rb
similarity index 97%
rename from lib/fog/zerigo/requests/dns/get_zone.rb
rename to lib/fog/dns/requests/zerigo/get_zone.rb
index 5cd630203..c1733ccf6 100644
--- a/lib/fog/zerigo/requests/dns/get_zone.rb
+++ b/lib/fog/dns/requests/zerigo/get_zone.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/zerigo/parsers/dns/get_zone'
+        require 'fog/dns/parsers/zerigo/get_zone'
 
         # Get details of a DNS zone. The response is similar to list_zones, with the 
         # addition of hosts-count and possibly hosts.
diff --git a/lib/fog/zerigo/requests/dns/get_zone_stats.rb b/lib/fog/dns/requests/zerigo/get_zone_stats.rb
similarity index 95%
rename from lib/fog/zerigo/requests/dns/get_zone_stats.rb
rename to lib/fog/dns/requests/zerigo/get_zone_stats.rb
index 2f87186d7..5b0122492 100644
--- a/lib/fog/zerigo/requests/dns/get_zone_stats.rb
+++ b/lib/fog/dns/requests/zerigo/get_zone_stats.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/zerigo/parsers/dns/get_zone_stats'
+        require 'fog/dns/parsers/zerigo/get_zone_stats'
 
         # returns current traffic statistics about this zone. Queries is measured from the 
         # beginning of the current period through the time of the API call.
diff --git a/lib/fog/zerigo/requests/dns/list_hosts.rb b/lib/fog/dns/requests/zerigo/list_hosts.rb
similarity index 96%
rename from lib/fog/zerigo/requests/dns/list_hosts.rb
rename to lib/fog/dns/requests/zerigo/list_hosts.rb
index c16e87421..790307cb7 100644
--- a/lib/fog/zerigo/requests/dns/list_hosts.rb
+++ b/lib/fog/dns/requests/zerigo/list_hosts.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/zerigo/parsers/dns/list_hosts'
+        require 'fog/dns/parsers/zerigo/list_hosts'
 
         # Get list of all DNS zones hosted on Slicehost (for this account)
         #
diff --git a/lib/fog/zerigo/requests/dns/list_zones.rb b/lib/fog/dns/requests/zerigo/list_zones.rb
similarity index 96%
rename from lib/fog/zerigo/requests/dns/list_zones.rb
rename to lib/fog/dns/requests/zerigo/list_zones.rb
index 6aa0f8e7f..9dba1b8fd 100644
--- a/lib/fog/zerigo/requests/dns/list_zones.rb
+++ b/lib/fog/dns/requests/zerigo/list_zones.rb
@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/zerigo/parsers/dns/list_zones'
+        require 'fog/dns/parsers/zerigo/list_zones'
 
         # Get list of all DNS zones hosted on Slicehost (for this account)
         #
diff --git a/lib/fog/zerigo/requests/dns/update_host.rb b/lib/fog/dns/requests/zerigo/update_host.rb
similarity index 100%
rename from lib/fog/zerigo/requests/dns/update_host.rb
rename to lib/fog/dns/requests/zerigo/update_host.rb
diff --git a/lib/fog/zerigo/requests/dns/update_zone.rb b/lib/fog/dns/requests/zerigo/update_zone.rb
similarity index 100%
rename from lib/fog/zerigo/requests/dns/update_zone.rb
rename to lib/fog/dns/requests/zerigo/update_zone.rb
diff --git a/lib/fog/slicehost/dns.rb b/lib/fog/dns/slicehost.rb
similarity index 95%
rename from lib/fog/slicehost/dns.rb
rename to lib/fog/dns/slicehost.rb
index 627eff827..107cbb500 100644
--- a/lib/fog/slicehost/dns.rb
+++ b/lib/fog/dns/slicehost.rb
@@ -5,13 +5,13 @@ module Fog
       requires :slicehost_password
       recognizes :host, :port, :scheme, :persistent
 
-      model_path 'fog/slicehost/models/dns'
+      model_path 'fog/dns/models/slicehost'
       model       :record
       collection  :records
       model       :zone
       collection  :zones
 
-      request_path 'fog/slicehost/requests/dns'
+      request_path 'fog/dns/requests/slicehost'
       request :create_record
       request :create_zone
       request :delete_record
diff --git a/lib/fog/zerigo/dns.rb b/lib/fog/dns/zerigo.rb
similarity index 96%
rename from lib/fog/zerigo/dns.rb
rename to lib/fog/dns/zerigo.rb
index 7dcccb7a6..3996e2971 100644
--- a/lib/fog/zerigo/dns.rb
+++ b/lib/fog/dns/zerigo.rb
@@ -5,13 +5,13 @@ module Fog
       requires :zerigo_email, :zerigo_token
       recognizes :timeout, :persistent
 
-      model_path 'fog/zerigo/models/dns'
+      model_path 'fog/dns/models/zerigo'
       model       :record
       collection  :records
       model       :zone
       collection  :zones
 
-      request_path 'fog/zerigo/requests/dns'
+      request_path 'fog/dns/models/zerigo'
       request :count_hosts
       request :count_zones
       request :create_host
diff --git a/lib/fog/linode.rb b/lib/fog/linode.rb
index c6fa761ca..250c912fd 100644
--- a/lib/fog/linode.rb
+++ b/lib/fog/linode.rb
@@ -6,7 +6,7 @@ module Fog
     extend Fog::Provider
 
     service(:compute, 'linode/compute')
-    service(:dns,     'linode/dns')
+    service(:dns,     'dns/linode')
 
     def self.new(attributes = {})
       location = caller.first
diff --git a/lib/fog/slicehost.rb b/lib/fog/slicehost.rb
index 8df79759f..da78bead8 100644
--- a/lib/fog/slicehost.rb
+++ b/lib/fog/slicehost.rb
@@ -9,7 +9,7 @@ module Fog
     extend Fog::Provider
 
     service(:compute, 'slicehost/compute')
-    service(:dns,     'slicehost/dns')
+    service(:dns,     'dns/slicehost')
 
     def self.new(attributes = {})
       location = caller.first
diff --git a/lib/fog/zerigo.rb b/lib/fog/zerigo.rb
index d05c5bed9..c0f89ed14 100644
--- a/lib/fog/zerigo.rb
+++ b/lib/fog/zerigo.rb
@@ -8,7 +8,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:dns, 'zerigo/dns')
+    service(:dns, 'dns/zerigo')
 
   end
 end