diff --git a/lib/fog/aws.rb b/lib/fog/aws.rb
index 829131ec7..25a077368 100644
--- a/lib/fog/aws.rb
+++ b/lib/fog/aws.rb
@@ -6,7 +6,7 @@ module Fog
     extend Fog::Provider
 
     service(:auto_scaling,    'aws/auto_scaling')
-    service(:cdn,             'cdn/aws')
+    service(:cdn,             'aws/cdn')
     service(:compute,         'compute/aws')
     service(:cloud_formation, 'aws/cloud_formation')
     service(:cloud_watch,     'aws/cloud_watch')
diff --git a/lib/fog/cdn/aws.rb b/lib/fog/aws/cdn.rb
similarity index 97%
rename from lib/fog/cdn/aws.rb
rename to lib/fog/aws/cdn.rb
index e9d9ed3e1..611910901 100644
--- a/lib/fog/cdn/aws.rb
+++ b/lib/fog/aws/cdn.rb
@@ -5,9 +5,9 @@ module Fog
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :host, :path, :port, :scheme, :version, :persistent
 
-      model_path 'fog/cdn/models/aws'
+      model_path 'fog/aws/cdn/models'
 
-      request_path 'fog/cdn/requests/aws'
+      request_path 'fog/aws/requests/cdn'
       request 'delete_distribution'
       request 'delete_streaming_distribution'
       request 'get_distribution'
diff --git a/lib/fog/cdn/parsers/aws/distribution.rb b/lib/fog/aws/parsers/cdn/distribution.rb
similarity index 100%
rename from lib/fog/cdn/parsers/aws/distribution.rb
rename to lib/fog/aws/parsers/cdn/distribution.rb
diff --git a/lib/fog/cdn/parsers/aws/get_distribution_list.rb b/lib/fog/aws/parsers/cdn/get_distribution_list.rb
similarity index 100%
rename from lib/fog/cdn/parsers/aws/get_distribution_list.rb
rename to lib/fog/aws/parsers/cdn/get_distribution_list.rb
diff --git a/lib/fog/cdn/parsers/aws/get_invalidation_list.rb b/lib/fog/aws/parsers/cdn/get_invalidation_list.rb
similarity index 100%
rename from lib/fog/cdn/parsers/aws/get_invalidation_list.rb
rename to lib/fog/aws/parsers/cdn/get_invalidation_list.rb
diff --git a/lib/fog/cdn/parsers/aws/get_streaming_distribution_list.rb b/lib/fog/aws/parsers/cdn/get_streaming_distribution_list.rb
similarity index 100%
rename from lib/fog/cdn/parsers/aws/get_streaming_distribution_list.rb
rename to lib/fog/aws/parsers/cdn/get_streaming_distribution_list.rb
diff --git a/lib/fog/cdn/parsers/aws/post_invalidation.rb b/lib/fog/aws/parsers/cdn/post_invalidation.rb
similarity index 100%
rename from lib/fog/cdn/parsers/aws/post_invalidation.rb
rename to lib/fog/aws/parsers/cdn/post_invalidation.rb
diff --git a/lib/fog/cdn/parsers/aws/streaming_distribution.rb b/lib/fog/aws/parsers/cdn/streaming_distribution.rb
similarity index 100%
rename from lib/fog/cdn/parsers/aws/streaming_distribution.rb
rename to lib/fog/aws/parsers/cdn/streaming_distribution.rb
diff --git a/lib/fog/cdn/requests/aws/delete_distribution.rb b/lib/fog/aws/requests/cdn/delete_distribution.rb
similarity index 100%
rename from lib/fog/cdn/requests/aws/delete_distribution.rb
rename to lib/fog/aws/requests/cdn/delete_distribution.rb
diff --git a/lib/fog/cdn/requests/aws/delete_streaming_distribution.rb b/lib/fog/aws/requests/cdn/delete_streaming_distribution.rb
similarity index 100%
rename from lib/fog/cdn/requests/aws/delete_streaming_distribution.rb
rename to lib/fog/aws/requests/cdn/delete_streaming_distribution.rb
diff --git a/lib/fog/cdn/requests/aws/get_distribution.rb b/lib/fog/aws/requests/cdn/get_distribution.rb
similarity index 97%
rename from lib/fog/cdn/requests/aws/get_distribution.rb
rename to lib/fog/aws/requests/cdn/get_distribution.rb
index 9840c3d36..3232fd400 100644
--- a/lib/fog/cdn/requests/aws/get_distribution.rb
+++ b/lib/fog/aws/requests/cdn/get_distribution.rb
@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/cdn/parsers/aws/distribution'
+        require 'fog/aws/parsers/cdn/distribution'
 
         # Get information about a distribution from CloudFront
         #
diff --git a/lib/fog/cdn/requests/aws/get_distribution_list.rb b/lib/fog/aws/requests/cdn/get_distribution_list.rb
similarity index 97%
rename from lib/fog/cdn/requests/aws/get_distribution_list.rb
rename to lib/fog/aws/requests/cdn/get_distribution_list.rb
index 33d64a9d1..a45d8acc3 100644
--- a/lib/fog/cdn/requests/aws/get_distribution_list.rb
+++ b/lib/fog/aws/requests/cdn/get_distribution_list.rb
@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/cdn/parsers/aws/get_distribution_list'
+        require 'fog/aws/parsers/cdn/get_distribution_list'
 
         # List information about distributions in CloudFront
         #
diff --git a/lib/fog/cdn/requests/aws/get_invalidation_list.rb b/lib/fog/aws/requests/cdn/get_invalidation_list.rb
similarity index 96%
rename from lib/fog/cdn/requests/aws/get_invalidation_list.rb
rename to lib/fog/aws/requests/cdn/get_invalidation_list.rb
index a906ad1e3..00f8e977a 100644
--- a/lib/fog/cdn/requests/aws/get_invalidation_list.rb
+++ b/lib/fog/aws/requests/cdn/get_invalidation_list.rb
@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/cdn/parsers/aws/get_invalidation_list'
+        require 'fog/aws/parsers/cdn/get_invalidation_list'
 
         # ==== Parameters
         # * options<~Hash> - config arguments for list.  Defaults to {}.
diff --git a/lib/fog/cdn/requests/aws/get_streaming_distribution.rb b/lib/fog/aws/requests/cdn/get_streaming_distribution.rb
similarity index 97%
rename from lib/fog/cdn/requests/aws/get_streaming_distribution.rb
rename to lib/fog/aws/requests/cdn/get_streaming_distribution.rb
index bff94035e..f45b96449 100644
--- a/lib/fog/cdn/requests/aws/get_streaming_distribution.rb
+++ b/lib/fog/aws/requests/cdn/get_streaming_distribution.rb
@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/cdn/parsers/aws/streaming_distribution'
+        require 'fog/aws/parsers/cdn/streaming_distribution'
 
         # Get information about a streaming distribution from CloudFront
         #
diff --git a/lib/fog/cdn/requests/aws/get_streaming_distribution_list.rb b/lib/fog/aws/requests/cdn/get_streaming_distribution_list.rb
similarity index 97%
rename from lib/fog/cdn/requests/aws/get_streaming_distribution_list.rb
rename to lib/fog/aws/requests/cdn/get_streaming_distribution_list.rb
index f6083a176..38c6dd552 100644
--- a/lib/fog/cdn/requests/aws/get_streaming_distribution_list.rb
+++ b/lib/fog/aws/requests/cdn/get_streaming_distribution_list.rb
@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/cdn/parsers/aws/get_streaming_distribution_list'
+        require 'fog/aws/parsers/cdn/get_streaming_distribution_list'
 
         # List information about distributions in CloudFront
         #
diff --git a/lib/fog/cdn/requests/aws/post_distribution.rb b/lib/fog/aws/requests/cdn/post_distribution.rb
similarity index 98%
rename from lib/fog/cdn/requests/aws/post_distribution.rb
rename to lib/fog/aws/requests/cdn/post_distribution.rb
index d75d10a04..b121fa7db 100644
--- a/lib/fog/cdn/requests/aws/post_distribution.rb
+++ b/lib/fog/aws/requests/cdn/post_distribution.rb
@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/cdn/parsers/aws/distribution'
+        require 'fog/aws/parsers/cdn/distribution'
 
         # create a new distribution in CloudFront
         #
diff --git a/lib/fog/cdn/requests/aws/post_invalidation.rb b/lib/fog/aws/requests/cdn/post_invalidation.rb
similarity index 97%
rename from lib/fog/cdn/requests/aws/post_invalidation.rb
rename to lib/fog/aws/requests/cdn/post_invalidation.rb
index 09fc899f4..5adcab19a 100644
--- a/lib/fog/cdn/requests/aws/post_invalidation.rb
+++ b/lib/fog/aws/requests/cdn/post_invalidation.rb
@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/cdn/parsers/aws/post_invalidation'
+        require 'fog/aws/parsers/cdn/post_invalidation'
 
         # List information about distributions in CloudFront
         #
diff --git a/lib/fog/cdn/requests/aws/post_streaming_distribution.rb b/lib/fog/aws/requests/cdn/post_streaming_distribution.rb
similarity index 98%
rename from lib/fog/cdn/requests/aws/post_streaming_distribution.rb
rename to lib/fog/aws/requests/cdn/post_streaming_distribution.rb
index 8ac09e6fd..33077dc5d 100644
--- a/lib/fog/cdn/requests/aws/post_streaming_distribution.rb
+++ b/lib/fog/aws/requests/cdn/post_streaming_distribution.rb
@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/cdn/parsers/aws/streaming_distribution'
+        require 'fog/aws/parsers/cdn/streaming_distribution'
 
         # create a new streaming distribution in CloudFront
         #
diff --git a/lib/fog/cdn/requests/aws/put_distribution_config.rb b/lib/fog/aws/requests/cdn/put_distribution_config.rb
similarity index 98%
rename from lib/fog/cdn/requests/aws/put_distribution_config.rb
rename to lib/fog/aws/requests/cdn/put_distribution_config.rb
index 6188f3ad8..adc836300 100644
--- a/lib/fog/cdn/requests/aws/put_distribution_config.rb
+++ b/lib/fog/aws/requests/cdn/put_distribution_config.rb
@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/cdn/parsers/aws/distribution'
+        require 'fog/aws/parsers/cdn/distribution'
 
         # update a distribution in CloudFront
         #
diff --git a/lib/fog/cdn/requests/aws/put_streaming_distribution_config.rb b/lib/fog/aws/requests/cdn/put_streaming_distribution_config.rb
similarity index 98%
rename from lib/fog/cdn/requests/aws/put_streaming_distribution_config.rb
rename to lib/fog/aws/requests/cdn/put_streaming_distribution_config.rb
index 88deacc3f..5fe6a27cc 100644
--- a/lib/fog/cdn/requests/aws/put_streaming_distribution_config.rb
+++ b/lib/fog/aws/requests/cdn/put_streaming_distribution_config.rb
@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/cdn/parsers/aws/streaming_distribution'
+        require 'fog/aws/parsers/cdn/streaming_distribution'
 
         # update a streaming distribution in CloudFront
         #
diff --git a/lib/fog/cdn.rb b/lib/fog/cdn.rb
index 0c3dce627..e0c20c9c3 100644
--- a/lib/fog/cdn.rb
+++ b/lib/fog/cdn.rb
@@ -9,7 +9,7 @@ module Fog
       attributes = attributes.dup # prevent delete from having side effects
       case provider = attributes.delete(:provider).to_s.downcase.to_sym
       when :aws
-        require 'fog/cdn/aws'
+        require 'fog/aws/cdn'
         Fog::CDN::AWS.new(attributes)
       when :rackspace
         require 'fog/cdn/rackspace'