diff --git a/lib/fog/aws/ec2.rb b/lib/fog/aws/ec2.rb
deleted file mode 100644
index ba0f91391..000000000
--- a/lib/fog/aws/ec2.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module Fog
-  module AWS
-    class EC2
-
-      def self.new(attributes = {})
-        location = caller.first
-        warning = "[yellow][WARN] Fog::AWS::EC2#new is deprecated, use Fog::AWS::Compute#new instead[/]"
-        warning << " [light_black](" << location << ")[/] "
-        Formatador.display_line(warning)
-        Fog::AWS::Compute.new(attributes)
-      end
-
-    end
-  end
-end
diff --git a/lib/fog/aws/s3.rb b/lib/fog/aws/s3.rb
deleted file mode 100644
index a1e1991c4..000000000
--- a/lib/fog/aws/s3.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module Fog
-  module AWS
-    class S3
-
-      def self.new(attributes = {})
-        location = caller.first
-        warning = "[yellow][WARN] Fog::AWS::S3#new is deprecated, use Fog::AWS::Storage#new instead[/]"
-        warning << " [light_black](" << location << ")[/] "
-        Formatador.display_line(warning)
-        Fog::AWS::Storage.new(attributes)
-      end
-
-    end
-  end
-end
diff --git a/lib/fog/compute/aws.rb b/lib/fog/compute/aws.rb
index 3078c03a1..86dc8c6de 100644
--- a/lib/fog/compute/aws.rb
+++ b/lib/fog/compute/aws.rb
@@ -1,3 +1,19 @@
+module Fog
+  module AWS
+    class EC2
+
+      def self.new(attributes = {})
+        location = caller.first
+        warning = "[yellow][WARN] Fog::AWS::EC2#new is deprecated, use Fog::AWS::Compute#new instead[/]"
+        warning << " [light_black](" << location << ")[/] "
+        Formatador.display_line(warning)
+        Fog::AWS::Compute.new(attributes)
+      end
+
+    end
+  end
+end
+
 module Fog
   module AWS
     class Compute < Fog::Service
diff --git a/lib/fog/compute/rackspace.rb b/lib/fog/compute/rackspace.rb
index ac9111048..ebd0990a4 100644
--- a/lib/fog/compute/rackspace.rb
+++ b/lib/fog/compute/rackspace.rb
@@ -1,3 +1,19 @@
+module Fog
+  module Rackspace
+    class Servers
+
+      def self.new(attributes = {})
+        location = caller.first
+        warning = "[yellow][WARN] Fog::Rackspace::Servers#new is deprecated, use Fog::Rackspace::Compute#new instead[/]"
+        warning << " [light_black](" << location << ")[/] "
+        Formatador.display_line(warning)
+        Fog::Rackspace::Compute.new(attributes)
+      end
+
+    end
+  end
+end
+
 module Fog
   module Rackspace
     class Compute < Fog::Service
diff --git a/lib/fog/providers/aws.rb b/lib/fog/providers/aws.rb
index 264a4a1ae..23c2cc690 100644
--- a/lib/fog/providers/aws.rb
+++ b/lib/fog/providers/aws.rb
@@ -11,10 +11,10 @@ module Fog
     service(:cdn,       'cdn/aws')
     service(:compute,   'compute/aws')
     service(:dns,       'dns/aws')
-    service(:ec2,       'aws/ec2')
+    service(:ec2,       'compute/aws')
     service(:elb,       'aws/elb')
     service(:iam,       'aws/iam')
-    service(:s3,        'aws/s3')
+    service(:s3,        'storage/aws')
     service(:simpledb,  'aws/simpledb')
     service(:storage,   'storage/aws')
 
diff --git a/lib/fog/providers/rackspace.rb b/lib/fog/providers/rackspace.rb
index 609520d07..f0c6193fb 100644
--- a/lib/fog/providers/rackspace.rb
+++ b/lib/fog/providers/rackspace.rb
@@ -7,8 +7,8 @@ module Fog
 
     service(:cdn,     'cdn/rackspace')
     service(:compute, 'rackspace/compute')
-    service(:files,   'rackspace/files')
-    service(:servers, 'rackspace/servers')
+    service(:files,   'storage/rackspace')
+    service(:servers, 'rackspace/compute')
     service(:storage, 'storage/rackspace')
 
     def self.authenticate(options)
diff --git a/lib/fog/rackspace/files.rb b/lib/fog/rackspace/files.rb
deleted file mode 100644
index 78bdc56d8..000000000
--- a/lib/fog/rackspace/files.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module Fog
-  module Rackspace
-    class Files
-
-      def self.new(attributes = {})
-        location = caller.first
-        warning = "[yellow][WARN] Fog::Rackspace::Files#new is deprecated, use Fog::Rackspace::Storage#new instead[/]"
-        warning << " [light_black](" << location << ")[/] "
-        Formatador.display_line(warning)
-        Fog::Rackspace::Storage.new(attributes)
-      end
-
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/fog/rackspace/servers.rb b/lib/fog/rackspace/servers.rb
deleted file mode 100644
index 2e33b6005..000000000
--- a/lib/fog/rackspace/servers.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module Fog
-  module Rackspace
-    class Servers
-
-      def self.new(attributes = {})
-        location = caller.first
-        warning = "[yellow][WARN] Fog::Rackspace::Servers#new is deprecated, use Fog::Rackspace::Compute#new instead[/]"
-        warning << " [light_black](" << location << ")[/] "
-        Formatador.display_line(warning)
-        Fog::Rackspace::Compute.new(attributes)
-      end
-
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/fog/storage/aws.rb b/lib/fog/storage/aws.rb
index fde08765e..aad07ac25 100644
--- a/lib/fog/storage/aws.rb
+++ b/lib/fog/storage/aws.rb
@@ -1,3 +1,19 @@
+module Fog
+  module AWS
+    class S3
+
+      def self.new(attributes = {})
+        location = caller.first
+        warning = "[yellow][WARN] Fog::AWS::S3#new is deprecated, use Fog::AWS::Storage#new instead[/]"
+        warning << " [light_black](" << location << ")[/] "
+        Formatador.display_line(warning)
+        Fog::AWS::Storage.new(attributes)
+      end
+
+    end
+  end
+end
+
 module Fog
   module AWS
     class Storage < Fog::Service
diff --git a/lib/fog/storage/rackspace.rb b/lib/fog/storage/rackspace.rb
index 593d62f70..fc780bcc8 100644
--- a/lib/fog/storage/rackspace.rb
+++ b/lib/fog/storage/rackspace.rb
@@ -1,3 +1,19 @@
+module Fog
+  module Rackspace
+    class Files
+
+      def self.new(attributes = {})
+        location = caller.first
+        warning = "[yellow][WARN] Fog::Rackspace::Files#new is deprecated, use Fog::Rackspace::Storage#new instead[/]"
+        warning << " [light_black](" << location << ")[/] "
+        Formatador.display_line(warning)
+        Fog::Rackspace::Storage.new(attributes)
+      end
+
+    end
+  end
+end
+
 module Fog
   module Rackspace
     class Storage < Fog::Service