diff --git a/lib/fog/dnsmadeeasy.rb b/lib/fog/dnsmadeeasy.rb
index f01007e7a..db431c4d2 100644
--- a/lib/fog/dnsmadeeasy.rb
+++ b/lib/fog/dnsmadeeasy.rb
@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:dns, 'dns/dnsmadeeasy')
+    service(:dns, 'dnsmadeeasy/dns')
 
   end
 end
diff --git a/lib/fog/dns/dnsmadeeasy.rb b/lib/fog/dnsmadeeasy/dns.rb
similarity index 97%
rename from lib/fog/dns/dnsmadeeasy.rb
rename to lib/fog/dnsmadeeasy/dns.rb
index 323cc34cf..d84b07aeb 100644
--- a/lib/fog/dns/dnsmadeeasy.rb
+++ b/lib/fog/dnsmadeeasy/dns.rb
@@ -5,13 +5,13 @@ module Fog
       requires :dnsmadeeasy_api_key, :dnsmadeeasy_secret_key
       recognizes :host, :path, :port, :scheme, :persistent
 
-      model_path 'fog/dns/models/dnsmadeeasy'
+      model_path 'fog/dnsmadeeasy/models/dns'
       model       :record
       collection  :records
       model       :zone
       collection  :zones
 
-      request_path 'fog/dns/requests/dnsmadeeasy'
+      request_path 'fog/dnsmadeeasy/requests/dns'
       request :list_domains
       request :get_domain
       request :create_domain
diff --git a/lib/fog/dns/models/dnsmadeeasy/record.rb b/lib/fog/dnsmadeeasy/models/dns/record.rb
similarity index 100%
rename from lib/fog/dns/models/dnsmadeeasy/record.rb
rename to lib/fog/dnsmadeeasy/models/dns/record.rb
diff --git a/lib/fog/dns/models/dnsmadeeasy/records.rb b/lib/fog/dnsmadeeasy/models/dns/records.rb
similarity index 93%
rename from lib/fog/dns/models/dnsmadeeasy/records.rb
rename to lib/fog/dnsmadeeasy/models/dns/records.rb
index 3aa0f477e..2ded4cbca 100644
--- a/lib/fog/dns/models/dnsmadeeasy/records.rb
+++ b/lib/fog/dnsmadeeasy/models/dns/records.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/dns/models/dnsmadeeasy/record'
+require 'fog/dnsmadeeasy/models/dns/record'
 
 module Fog
   module DNS
diff --git a/lib/fog/dns/models/dnsmadeeasy/zone.rb b/lib/fog/dnsmadeeasy/models/dns/zone.rb
similarity index 95%
rename from lib/fog/dns/models/dnsmadeeasy/zone.rb
rename to lib/fog/dnsmadeeasy/models/dns/zone.rb
index 3fe2a0d53..78143b8db 100644
--- a/lib/fog/dns/models/dnsmadeeasy/zone.rb
+++ b/lib/fog/dnsmadeeasy/models/dns/zone.rb
@@ -1,5 +1,5 @@
 require 'fog/core/model'
-require 'fog/dns/models/dnsmadeeasy/records'
+require 'fog/dnsmadeeasy/models/dns/records'
 
 module Fog
   module DNS
diff --git a/lib/fog/dns/models/dnsmadeeasy/zones.rb b/lib/fog/dnsmadeeasy/models/dns/zones.rb
similarity index 92%
rename from lib/fog/dns/models/dnsmadeeasy/zones.rb
rename to lib/fog/dnsmadeeasy/models/dns/zones.rb
index ba16e582c..bdd533ee8 100644
--- a/lib/fog/dns/models/dnsmadeeasy/zones.rb
+++ b/lib/fog/dnsmadeeasy/models/dns/zones.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/dns/models/dnsmadeeasy/zone'
+require 'fog/dnsmadeeasy/models/dns/zone'
 
 module Fog
   module DNS
diff --git a/lib/fog/dns/requests/dnsmadeeasy/create_domain.rb b/lib/fog/dnsmadeeasy/requests/dns/create_domain.rb
similarity index 100%
rename from lib/fog/dns/requests/dnsmadeeasy/create_domain.rb
rename to lib/fog/dnsmadeeasy/requests/dns/create_domain.rb
diff --git a/lib/fog/dns/requests/dnsmadeeasy/create_record.rb b/lib/fog/dnsmadeeasy/requests/dns/create_record.rb
similarity index 100%
rename from lib/fog/dns/requests/dnsmadeeasy/create_record.rb
rename to lib/fog/dnsmadeeasy/requests/dns/create_record.rb
diff --git a/lib/fog/dns/requests/dnsmadeeasy/create_secondary.rb b/lib/fog/dnsmadeeasy/requests/dns/create_secondary.rb
similarity index 100%
rename from lib/fog/dns/requests/dnsmadeeasy/create_secondary.rb
rename to lib/fog/dnsmadeeasy/requests/dns/create_secondary.rb
diff --git a/lib/fog/dns/requests/dnsmadeeasy/delete_all_domains.rb b/lib/fog/dnsmadeeasy/requests/dns/delete_all_domains.rb
similarity index 100%
rename from lib/fog/dns/requests/dnsmadeeasy/delete_all_domains.rb
rename to lib/fog/dnsmadeeasy/requests/dns/delete_all_domains.rb
diff --git a/lib/fog/dns/requests/dnsmadeeasy/delete_all_secondary.rb b/lib/fog/dnsmadeeasy/requests/dns/delete_all_secondary.rb
similarity index 100%
rename from lib/fog/dns/requests/dnsmadeeasy/delete_all_secondary.rb
rename to lib/fog/dnsmadeeasy/requests/dns/delete_all_secondary.rb
diff --git a/lib/fog/dns/requests/dnsmadeeasy/delete_domain.rb b/lib/fog/dnsmadeeasy/requests/dns/delete_domain.rb
similarity index 100%
rename from lib/fog/dns/requests/dnsmadeeasy/delete_domain.rb
rename to lib/fog/dnsmadeeasy/requests/dns/delete_domain.rb
diff --git a/lib/fog/dns/requests/dnsmadeeasy/delete_record.rb b/lib/fog/dnsmadeeasy/requests/dns/delete_record.rb
similarity index 100%
rename from lib/fog/dns/requests/dnsmadeeasy/delete_record.rb
rename to lib/fog/dnsmadeeasy/requests/dns/delete_record.rb
diff --git a/lib/fog/dns/requests/dnsmadeeasy/delete_secondary.rb b/lib/fog/dnsmadeeasy/requests/dns/delete_secondary.rb
similarity index 100%
rename from lib/fog/dns/requests/dnsmadeeasy/delete_secondary.rb
rename to lib/fog/dnsmadeeasy/requests/dns/delete_secondary.rb
diff --git a/lib/fog/dns/requests/dnsmadeeasy/get_domain.rb b/lib/fog/dnsmadeeasy/requests/dns/get_domain.rb
similarity index 100%
rename from lib/fog/dns/requests/dnsmadeeasy/get_domain.rb
rename to lib/fog/dnsmadeeasy/requests/dns/get_domain.rb
diff --git a/lib/fog/dns/requests/dnsmadeeasy/get_record.rb b/lib/fog/dnsmadeeasy/requests/dns/get_record.rb
similarity index 100%
rename from lib/fog/dns/requests/dnsmadeeasy/get_record.rb
rename to lib/fog/dnsmadeeasy/requests/dns/get_record.rb
diff --git a/lib/fog/dns/requests/dnsmadeeasy/get_secondary.rb b/lib/fog/dnsmadeeasy/requests/dns/get_secondary.rb
similarity index 100%
rename from lib/fog/dns/requests/dnsmadeeasy/get_secondary.rb
rename to lib/fog/dnsmadeeasy/requests/dns/get_secondary.rb
diff --git a/lib/fog/dns/requests/dnsmadeeasy/list_domains.rb b/lib/fog/dnsmadeeasy/requests/dns/list_domains.rb
similarity index 100%
rename from lib/fog/dns/requests/dnsmadeeasy/list_domains.rb
rename to lib/fog/dnsmadeeasy/requests/dns/list_domains.rb
diff --git a/lib/fog/dns/requests/dnsmadeeasy/list_records.rb b/lib/fog/dnsmadeeasy/requests/dns/list_records.rb
similarity index 100%
rename from lib/fog/dns/requests/dnsmadeeasy/list_records.rb
rename to lib/fog/dnsmadeeasy/requests/dns/list_records.rb
diff --git a/lib/fog/dns/requests/dnsmadeeasy/list_secondary.rb b/lib/fog/dnsmadeeasy/requests/dns/list_secondary.rb
similarity index 100%
rename from lib/fog/dns/requests/dnsmadeeasy/list_secondary.rb
rename to lib/fog/dnsmadeeasy/requests/dns/list_secondary.rb
diff --git a/lib/fog/dns/requests/dnsmadeeasy/update_record.rb b/lib/fog/dnsmadeeasy/requests/dns/update_record.rb
similarity index 100%
rename from lib/fog/dns/requests/dnsmadeeasy/update_record.rb
rename to lib/fog/dnsmadeeasy/requests/dns/update_record.rb
diff --git a/lib/fog/dns/requests/dnsmadeeasy/update_secondary.rb b/lib/fog/dnsmadeeasy/requests/dns/update_secondary.rb
similarity index 100%
rename from lib/fog/dns/requests/dnsmadeeasy/update_secondary.rb
rename to lib/fog/dnsmadeeasy/requests/dns/update_secondary.rb