diff --git a/tests/compute/models/aws/address_tests.rb b/tests/aws/models/compute/address_tests.rb
similarity index 100%
rename from tests/compute/models/aws/address_tests.rb
rename to tests/aws/models/compute/address_tests.rb
diff --git a/tests/compute/models/aws/addresses_tests.rb b/tests/aws/models/compute/addresses_tests.rb
similarity index 100%
rename from tests/compute/models/aws/addresses_tests.rb
rename to tests/aws/models/compute/addresses_tests.rb
diff --git a/tests/compute/models/aws/key_pair_tests.rb b/tests/aws/models/compute/key_pair_tests.rb
similarity index 100%
rename from tests/compute/models/aws/key_pair_tests.rb
rename to tests/aws/models/compute/key_pair_tests.rb
diff --git a/tests/compute/models/aws/key_pairs_tests.rb b/tests/aws/models/compute/key_pairs_tests.rb
similarity index 100%
rename from tests/compute/models/aws/key_pairs_tests.rb
rename to tests/aws/models/compute/key_pairs_tests.rb
diff --git a/tests/compute/models/aws/security_group_tests.rb b/tests/aws/models/compute/security_group_tests.rb
similarity index 100%
rename from tests/compute/models/aws/security_group_tests.rb
rename to tests/aws/models/compute/security_group_tests.rb
diff --git a/tests/compute/models/aws/security_groups_tests.rb b/tests/aws/models/compute/security_groups_tests.rb
similarity index 100%
rename from tests/compute/models/aws/security_groups_tests.rb
rename to tests/aws/models/compute/security_groups_tests.rb
diff --git a/tests/compute/models/aws/server_tests.rb b/tests/aws/models/compute/server_tests.rb
similarity index 100%
rename from tests/compute/models/aws/server_tests.rb
rename to tests/aws/models/compute/server_tests.rb
diff --git a/tests/compute/models/aws/snapshot_tests.rb b/tests/aws/models/compute/snapshot_tests.rb
similarity index 100%
rename from tests/compute/models/aws/snapshot_tests.rb
rename to tests/aws/models/compute/snapshot_tests.rb
diff --git a/tests/compute/models/aws/snapshots_tests.rb b/tests/aws/models/compute/snapshots_tests.rb
similarity index 100%
rename from tests/compute/models/aws/snapshots_tests.rb
rename to tests/aws/models/compute/snapshots_tests.rb
diff --git a/tests/compute/models/aws/volume_tests.rb b/tests/aws/models/compute/volume_tests.rb
similarity index 100%
rename from tests/compute/models/aws/volume_tests.rb
rename to tests/aws/models/compute/volume_tests.rb
diff --git a/tests/compute/models/aws/volumes_tests.rb b/tests/aws/models/compute/volumes_tests.rb
similarity index 100%
rename from tests/compute/models/aws/volumes_tests.rb
rename to tests/aws/models/compute/volumes_tests.rb
diff --git a/tests/compute/requests/aws/address_tests.rb b/tests/aws/requests/compute/address_tests.rb
similarity index 100%
rename from tests/compute/requests/aws/address_tests.rb
rename to tests/aws/requests/compute/address_tests.rb
diff --git a/tests/compute/requests/aws/availability_zone_tests.rb b/tests/aws/requests/compute/availability_zone_tests.rb
similarity index 100%
rename from tests/compute/requests/aws/availability_zone_tests.rb
rename to tests/aws/requests/compute/availability_zone_tests.rb
diff --git a/tests/compute/requests/aws/helper.rb b/tests/aws/requests/compute/helper.rb
similarity index 100%
rename from tests/compute/requests/aws/helper.rb
rename to tests/aws/requests/compute/helper.rb
diff --git a/tests/compute/requests/aws/image_tests.rb b/tests/aws/requests/compute/image_tests.rb
similarity index 100%
rename from tests/compute/requests/aws/image_tests.rb
rename to tests/aws/requests/compute/image_tests.rb
diff --git a/tests/compute/requests/aws/instance_tests.rb b/tests/aws/requests/compute/instance_tests.rb
similarity index 100%
rename from tests/compute/requests/aws/instance_tests.rb
rename to tests/aws/requests/compute/instance_tests.rb
diff --git a/tests/compute/requests/aws/key_pair_tests.rb b/tests/aws/requests/compute/key_pair_tests.rb
similarity index 100%
rename from tests/compute/requests/aws/key_pair_tests.rb
rename to tests/aws/requests/compute/key_pair_tests.rb
diff --git a/tests/compute/requests/aws/placement_group_tests.rb b/tests/aws/requests/compute/placement_group_tests.rb
similarity index 100%
rename from tests/compute/requests/aws/placement_group_tests.rb
rename to tests/aws/requests/compute/placement_group_tests.rb
diff --git a/tests/compute/requests/aws/region_tests.rb b/tests/aws/requests/compute/region_tests.rb
similarity index 100%
rename from tests/compute/requests/aws/region_tests.rb
rename to tests/aws/requests/compute/region_tests.rb
diff --git a/tests/compute/requests/aws/security_group_tests.rb b/tests/aws/requests/compute/security_group_tests.rb
similarity index 100%
rename from tests/compute/requests/aws/security_group_tests.rb
rename to tests/aws/requests/compute/security_group_tests.rb
diff --git a/tests/compute/requests/aws/snapshot_tests.rb b/tests/aws/requests/compute/snapshot_tests.rb
similarity index 100%
rename from tests/compute/requests/aws/snapshot_tests.rb
rename to tests/aws/requests/compute/snapshot_tests.rb
diff --git a/tests/compute/requests/aws/spot_datafeed_subscription_tests.rb b/tests/aws/requests/compute/spot_datafeed_subscription_tests.rb
similarity index 100%
rename from tests/compute/requests/aws/spot_datafeed_subscription_tests.rb
rename to tests/aws/requests/compute/spot_datafeed_subscription_tests.rb
diff --git a/tests/compute/requests/aws/spot_instance_tests.rb b/tests/aws/requests/compute/spot_instance_tests.rb
similarity index 100%
rename from tests/compute/requests/aws/spot_instance_tests.rb
rename to tests/aws/requests/compute/spot_instance_tests.rb
diff --git a/tests/compute/requests/aws/spot_price_history_tests.rb b/tests/aws/requests/compute/spot_price_history_tests.rb
similarity index 100%
rename from tests/compute/requests/aws/spot_price_history_tests.rb
rename to tests/aws/requests/compute/spot_price_history_tests.rb
diff --git a/tests/compute/requests/aws/tag_tests.rb b/tests/aws/requests/compute/tag_tests.rb
similarity index 100%
rename from tests/compute/requests/aws/tag_tests.rb
rename to tests/aws/requests/compute/tag_tests.rb
diff --git a/tests/compute/requests/aws/volume_tests.rb b/tests/aws/requests/compute/volume_tests.rb
similarity index 100%
rename from tests/compute/requests/aws/volume_tests.rb
rename to tests/aws/requests/compute/volume_tests.rb
diff --git a/tests/dns/requests/aws/dns_tests.rb b/tests/aws/requests/dns/dns_tests.rb
similarity index 100%
rename from tests/dns/requests/aws/dns_tests.rb
rename to tests/aws/requests/dns/dns_tests.rb
diff --git a/tests/storage/requests/aws/bucket_tests.rb b/tests/aws/requests/storage/bucket_tests.rb
similarity index 100%
rename from tests/storage/requests/aws/bucket_tests.rb
rename to tests/aws/requests/storage/bucket_tests.rb
diff --git a/tests/storage/requests/aws/multipart_upload_tests.rb b/tests/aws/requests/storage/multipart_upload_tests.rb
similarity index 100%
rename from tests/storage/requests/aws/multipart_upload_tests.rb
rename to tests/aws/requests/storage/multipart_upload_tests.rb
diff --git a/tests/storage/requests/aws/object_tests.rb b/tests/aws/requests/storage/object_tests.rb
similarity index 100%
rename from tests/storage/requests/aws/object_tests.rb
rename to tests/aws/requests/storage/object_tests.rb
diff --git a/tests/compute/requests/bluebox/block_tests.rb b/tests/bluebox/requests/compute/block_tests.rb
similarity index 100%
rename from tests/compute/requests/bluebox/block_tests.rb
rename to tests/bluebox/requests/compute/block_tests.rb
diff --git a/tests/compute/requests/bluebox/helper.rb b/tests/bluebox/requests/compute/helper.rb
similarity index 100%
rename from tests/compute/requests/bluebox/helper.rb
rename to tests/bluebox/requests/compute/helper.rb
diff --git a/tests/compute/requests/bluebox/product_tests.rb b/tests/bluebox/requests/compute/product_tests.rb
similarity index 100%
rename from tests/compute/requests/bluebox/product_tests.rb
rename to tests/bluebox/requests/compute/product_tests.rb
diff --git a/tests/compute/requests/bluebox/template_tests.rb b/tests/bluebox/requests/compute/template_tests.rb
similarity index 100%
rename from tests/compute/requests/bluebox/template_tests.rb
rename to tests/bluebox/requests/compute/template_tests.rb
diff --git a/tests/dns/requests/bluebox/dns_tests.rb b/tests/bluebox/requests/dns/dns_tests.rb
similarity index 100%
rename from tests/dns/requests/bluebox/dns_tests.rb
rename to tests/bluebox/requests/dns/dns_tests.rb
diff --git a/tests/compute/requests/brightbox/account_tests.rb b/tests/brightbox/requests/compute/account_tests.rb
similarity index 100%
rename from tests/compute/requests/brightbox/account_tests.rb
rename to tests/brightbox/requests/compute/account_tests.rb
diff --git a/tests/compute/requests/brightbox/api_client_tests.rb b/tests/brightbox/requests/compute/api_client_tests.rb
similarity index 100%
rename from tests/compute/requests/brightbox/api_client_tests.rb
rename to tests/brightbox/requests/compute/api_client_tests.rb
diff --git a/tests/compute/requests/brightbox/cloud_ip_tests.rb b/tests/brightbox/requests/compute/cloud_ip_tests.rb
similarity index 100%
rename from tests/compute/requests/brightbox/cloud_ip_tests.rb
rename to tests/brightbox/requests/compute/cloud_ip_tests.rb
diff --git a/tests/compute/requests/brightbox/helper.rb b/tests/brightbox/requests/compute/helper.rb
similarity index 100%
rename from tests/compute/requests/brightbox/helper.rb
rename to tests/brightbox/requests/compute/helper.rb
diff --git a/tests/compute/requests/brightbox/image_tests.rb b/tests/brightbox/requests/compute/image_tests.rb
similarity index 100%
rename from tests/compute/requests/brightbox/image_tests.rb
rename to tests/brightbox/requests/compute/image_tests.rb
diff --git a/tests/compute/requests/brightbox/interface_tests.rb b/tests/brightbox/requests/compute/interface_tests.rb
similarity index 100%
rename from tests/compute/requests/brightbox/interface_tests.rb
rename to tests/brightbox/requests/compute/interface_tests.rb
diff --git a/tests/compute/requests/brightbox/load_balancer_tests.rb b/tests/brightbox/requests/compute/load_balancer_tests.rb
similarity index 100%
rename from tests/compute/requests/brightbox/load_balancer_tests.rb
rename to tests/brightbox/requests/compute/load_balancer_tests.rb
diff --git a/tests/compute/requests/brightbox/server_group_tests.rb b/tests/brightbox/requests/compute/server_group_tests.rb
similarity index 100%
rename from tests/compute/requests/brightbox/server_group_tests.rb
rename to tests/brightbox/requests/compute/server_group_tests.rb
diff --git a/tests/compute/requests/brightbox/server_tests.rb b/tests/brightbox/requests/compute/server_tests.rb
similarity index 100%
rename from tests/compute/requests/brightbox/server_tests.rb
rename to tests/brightbox/requests/compute/server_tests.rb
diff --git a/tests/compute/requests/brightbox/server_type_tests.rb b/tests/brightbox/requests/compute/server_type_tests.rb
similarity index 100%
rename from tests/compute/requests/brightbox/server_type_tests.rb
rename to tests/brightbox/requests/compute/server_type_tests.rb
diff --git a/tests/compute/requests/brightbox/user_tests.rb b/tests/brightbox/requests/compute/user_tests.rb
similarity index 100%
rename from tests/compute/requests/brightbox/user_tests.rb
rename to tests/brightbox/requests/compute/user_tests.rb
diff --git a/tests/compute/requests/brightbox/zone_tests.rb b/tests/brightbox/requests/compute/zone_tests.rb
similarity index 100%
rename from tests/compute/requests/brightbox/zone_tests.rb
rename to tests/brightbox/requests/compute/zone_tests.rb
diff --git a/tests/compute/parsers/aws/monitor_unmonitor_instances_tests.rb b/tests/compute/parsers/aws/monitor_unmonitor_instances_tests.rb
deleted file mode 100644
index 6b18a8d84..000000000
--- a/tests/compute/parsers/aws/monitor_unmonitor_instances_tests.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'fog/aws/parsers/compute/monitor_unmonitor_instances'
-
-Shindo.tests('Compute::AWS::MonitorUnmonitorInstances | monitor/unmonitor parser') do
-
-  tests('success') do
-
-    tests('#parse') do
-
-      aws_result = <<-AWS
-        <UnmonitorInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2010-11-15/">
-           <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
-           <instancesSet>
-              <item>
-                 <instanceId>i-43a4412a</instanceId>
-                 <monitoring>
-                    <state>enabled</state>
-                 </monitoring>
-              </item>
-              <item>
-                 <instanceId>i-23a3397d</instanceId>
-                 <monitoring>
-                    <state>disabled</state>
-                 </monitoring>
-              </item>
-           </instancesSet>
-        </UnmonitorInstancesResponse>
-      AWS
-
-      parser = Fog::Parsers::Compute::AWS::MonitorUnmonitorInstances.new
-      body = Nokogiri::XML::SAX::PushParser.new(parser)
-      body << aws_result
-
-      test('requestId') { parser.response['requestId'] == '59dbff89-35bd-4eac-99ed-be587EXAMPLE' }
-
-      test('enabled') do
-        selected = parser.response['instancesSet'].select { |item| item['instanceId'] == 'i-43a4412a' }[0]
-        selected['monitoring'] == 'enabled'
-      end
-
-      test('disabled') do
-        selected = parser.response['instancesSet'].select { |item| item['instanceId'] == 'i-23a3397d' }[0]
-        selected['monitoring'] == 'disabled'
-      end
-      
-    end
-
-  end
-
-end
diff --git a/tests/dns/requests/dnsimple/dns_tests.rb b/tests/dnsimple/requests/dns/dns_tests.rb
similarity index 100%
rename from tests/dns/requests/dnsimple/dns_tests.rb
rename to tests/dnsimple/requests/dns/dns_tests.rb
diff --git a/tests/dns/requests/dnsmadeeasy/dns_tests.rb b/tests/dnsmadeeasy/requests/dns/dns_tests.rb
similarity index 100%
rename from tests/dns/requests/dnsmadeeasy/dns_tests.rb
rename to tests/dnsmadeeasy/requests/dns/dns_tests.rb
diff --git a/tests/dns/requests/dynect/dns_tests.rb b/tests/dynect/requests/dns/dns_tests.rb
similarity index 100%
rename from tests/dns/requests/dynect/dns_tests.rb
rename to tests/dynect/requests/dns/dns_tests.rb
diff --git a/tests/compute/requests/glesys/helper.rb b/tests/glesys/requests/compute/helper.rb
similarity index 100%
rename from tests/compute/requests/glesys/helper.rb
rename to tests/glesys/requests/compute/helper.rb
diff --git a/tests/compute/requests/glesys/ip_tests.rb b/tests/glesys/requests/compute/ip_tests.rb
similarity index 100%
rename from tests/compute/requests/glesys/ip_tests.rb
rename to tests/glesys/requests/compute/ip_tests.rb
diff --git a/tests/compute/requests/glesys/server_tests.rb b/tests/glesys/requests/compute/server_tests.rb
similarity index 100%
rename from tests/compute/requests/glesys/server_tests.rb
rename to tests/glesys/requests/compute/server_tests.rb
diff --git a/tests/compute/requests/glesys/template_tests.rb b/tests/glesys/requests/compute/template_tests.rb
similarity index 100%
rename from tests/compute/requests/glesys/template_tests.rb
rename to tests/glesys/requests/compute/template_tests.rb
diff --git a/tests/compute/requests/go_grid/image_tests.rb b/tests/go_grid/requests/compute/image_tests.rb
similarity index 100%
rename from tests/compute/requests/go_grid/image_tests.rb
rename to tests/go_grid/requests/compute/image_tests.rb
diff --git a/tests/storage/requests/google/bucket_tests.rb b/tests/google/requests/storage/bucket_tests.rb
similarity index 100%
rename from tests/storage/requests/google/bucket_tests.rb
rename to tests/google/requests/storage/bucket_tests.rb
diff --git a/tests/storage/requests/google/object_tests.rb b/tests/google/requests/storage/object_tests.rb
similarity index 100%
rename from tests/storage/requests/google/object_tests.rb
rename to tests/google/requests/storage/object_tests.rb
diff --git a/tests/compute/requests/linode/datacenter_tests.rb b/tests/linode/requests/compute/datacenter_tests.rb
similarity index 100%
rename from tests/compute/requests/linode/datacenter_tests.rb
rename to tests/linode/requests/compute/datacenter_tests.rb
diff --git a/tests/compute/requests/linode/distribution_tests.rb b/tests/linode/requests/compute/distribution_tests.rb
similarity index 100%
rename from tests/compute/requests/linode/distribution_tests.rb
rename to tests/linode/requests/compute/distribution_tests.rb
diff --git a/tests/compute/requests/linode/helper.rb b/tests/linode/requests/compute/helper.rb
similarity index 100%
rename from tests/compute/requests/linode/helper.rb
rename to tests/linode/requests/compute/helper.rb
diff --git a/tests/compute/requests/linode/kernel_tests.rb b/tests/linode/requests/compute/kernel_tests.rb
similarity index 100%
rename from tests/compute/requests/linode/kernel_tests.rb
rename to tests/linode/requests/compute/kernel_tests.rb
diff --git a/tests/compute/requests/linode/linode_tests.rb b/tests/linode/requests/compute/linode_tests.rb
similarity index 100%
rename from tests/compute/requests/linode/linode_tests.rb
rename to tests/linode/requests/compute/linode_tests.rb
diff --git a/tests/compute/requests/linode/linodeplans_tests.rb b/tests/linode/requests/compute/linodeplans_tests.rb
similarity index 100%
rename from tests/compute/requests/linode/linodeplans_tests.rb
rename to tests/linode/requests/compute/linodeplans_tests.rb
diff --git a/tests/compute/requests/linode/stackscripts_tests.rb b/tests/linode/requests/compute/stackscripts_tests.rb
similarity index 100%
rename from tests/compute/requests/linode/stackscripts_tests.rb
rename to tests/linode/requests/compute/stackscripts_tests.rb
diff --git a/tests/dns/requests/linode/dns_tests.rb b/tests/linode/requests/dns/dns_tests.rb
similarity index 100%
rename from tests/dns/requests/linode/dns_tests.rb
rename to tests/linode/requests/dns/dns_tests.rb
diff --git a/tests/storage/models/ninefold/file_update_tests.rb b/tests/ninefold/models/storage/file_update_tests.rb
similarity index 100%
rename from tests/storage/models/ninefold/file_update_tests.rb
rename to tests/ninefold/models/storage/file_update_tests.rb
diff --git a/tests/storage/models/ninefold/nested_directories_tests.rb b/tests/ninefold/models/storage/nested_directories_tests.rb
similarity index 100%
rename from tests/storage/models/ninefold/nested_directories_tests.rb
rename to tests/ninefold/models/storage/nested_directories_tests.rb
diff --git a/tests/compute/requests/ninefold/address_tests.rb b/tests/ninefold/requests/compute/address_tests.rb
similarity index 100%
rename from tests/compute/requests/ninefold/address_tests.rb
rename to tests/ninefold/requests/compute/address_tests.rb
diff --git a/tests/compute/requests/ninefold/async_job_tests.rb b/tests/ninefold/requests/compute/async_job_tests.rb
similarity index 100%
rename from tests/compute/requests/ninefold/async_job_tests.rb
rename to tests/ninefold/requests/compute/async_job_tests.rb
diff --git a/tests/compute/requests/ninefold/helper.rb b/tests/ninefold/requests/compute/helper.rb
similarity index 100%
rename from tests/compute/requests/ninefold/helper.rb
rename to tests/ninefold/requests/compute/helper.rb
diff --git a/tests/compute/requests/ninefold/list_tests.rb b/tests/ninefold/requests/compute/list_tests.rb
similarity index 100%
rename from tests/compute/requests/ninefold/list_tests.rb
rename to tests/ninefold/requests/compute/list_tests.rb
diff --git a/tests/compute/requests/ninefold/nat_tests.rb b/tests/ninefold/requests/compute/nat_tests.rb
similarity index 100%
rename from tests/compute/requests/ninefold/nat_tests.rb
rename to tests/ninefold/requests/compute/nat_tests.rb
diff --git a/tests/compute/requests/ninefold/network_tests.rb b/tests/ninefold/requests/compute/network_tests.rb
similarity index 100%
rename from tests/compute/requests/ninefold/network_tests.rb
rename to tests/ninefold/requests/compute/network_tests.rb
diff --git a/tests/compute/requests/ninefold/template_tests.rb b/tests/ninefold/requests/compute/template_tests.rb
similarity index 100%
rename from tests/compute/requests/ninefold/template_tests.rb
rename to tests/ninefold/requests/compute/template_tests.rb
diff --git a/tests/compute/requests/ninefold/virtual_machine_tests.rb b/tests/ninefold/requests/compute/virtual_machine_tests.rb
similarity index 100%
rename from tests/compute/requests/ninefold/virtual_machine_tests.rb
rename to tests/ninefold/requests/compute/virtual_machine_tests.rb
diff --git a/tests/compute/requests/rackspace/address_tests.rb b/tests/rackspace/requests/compute/address_tests.rb
similarity index 100%
rename from tests/compute/requests/rackspace/address_tests.rb
rename to tests/rackspace/requests/compute/address_tests.rb
diff --git a/tests/compute/requests/rackspace/flavor_tests.rb b/tests/rackspace/requests/compute/flavor_tests.rb
similarity index 100%
rename from tests/compute/requests/rackspace/flavor_tests.rb
rename to tests/rackspace/requests/compute/flavor_tests.rb
diff --git a/tests/compute/requests/rackspace/helper.rb b/tests/rackspace/requests/compute/helper.rb
similarity index 100%
rename from tests/compute/requests/rackspace/helper.rb
rename to tests/rackspace/requests/compute/helper.rb
diff --git a/tests/compute/requests/rackspace/image_tests.rb b/tests/rackspace/requests/compute/image_tests.rb
similarity index 100%
rename from tests/compute/requests/rackspace/image_tests.rb
rename to tests/rackspace/requests/compute/image_tests.rb
diff --git a/tests/compute/requests/rackspace/resize_tests.rb b/tests/rackspace/requests/compute/resize_tests.rb
similarity index 100%
rename from tests/compute/requests/rackspace/resize_tests.rb
rename to tests/rackspace/requests/compute/resize_tests.rb
diff --git a/tests/compute/requests/rackspace/server_tests.rb b/tests/rackspace/requests/compute/server_tests.rb
similarity index 100%
rename from tests/compute/requests/rackspace/server_tests.rb
rename to tests/rackspace/requests/compute/server_tests.rb
diff --git a/tests/dns/requests/rackspace/dns_tests.rb b/tests/rackspace/requests/dns/dns_tests.rb
similarity index 100%
rename from tests/dns/requests/rackspace/dns_tests.rb
rename to tests/rackspace/requests/dns/dns_tests.rb
diff --git a/tests/dns/requests/rackspace/helper.rb b/tests/rackspace/requests/dns/helper.rb
similarity index 100%
rename from tests/dns/requests/rackspace/helper.rb
rename to tests/rackspace/requests/dns/helper.rb
diff --git a/tests/dns/requests/rackspace/records_tests.rb b/tests/rackspace/requests/dns/records_tests.rb
similarity index 100%
rename from tests/dns/requests/rackspace/records_tests.rb
rename to tests/rackspace/requests/dns/records_tests.rb
diff --git a/tests/storage/requests/rackspace/container_tests.rb b/tests/rackspace/requests/storage/container_tests.rb
similarity index 100%
rename from tests/storage/requests/rackspace/container_tests.rb
rename to tests/rackspace/requests/storage/container_tests.rb
diff --git a/tests/storage/requests/rackspace/large_object_tests.rb b/tests/rackspace/requests/storage/large_object_tests.rb
similarity index 100%
rename from tests/storage/requests/rackspace/large_object_tests.rb
rename to tests/rackspace/requests/storage/large_object_tests.rb
diff --git a/tests/storage/requests/rackspace/object_tests.rb b/tests/rackspace/requests/storage/object_tests.rb
similarity index 100%
rename from tests/storage/requests/rackspace/object_tests.rb
rename to tests/rackspace/requests/storage/object_tests.rb
diff --git a/tests/compute/requests/slicehost/backup_tests.rb b/tests/slicehost/requests/compute/backup_tests.rb
similarity index 100%
rename from tests/compute/requests/slicehost/backup_tests.rb
rename to tests/slicehost/requests/compute/backup_tests.rb
diff --git a/tests/compute/requests/slicehost/flavor_tests.rb b/tests/slicehost/requests/compute/flavor_tests.rb
similarity index 100%
rename from tests/compute/requests/slicehost/flavor_tests.rb
rename to tests/slicehost/requests/compute/flavor_tests.rb
diff --git a/tests/compute/requests/slicehost/image_tests.rb b/tests/slicehost/requests/compute/image_tests.rb
similarity index 100%
rename from tests/compute/requests/slicehost/image_tests.rb
rename to tests/slicehost/requests/compute/image_tests.rb
diff --git a/tests/compute/requests/slicehost/slice_tests.rb b/tests/slicehost/requests/compute/slice_tests.rb
similarity index 100%
rename from tests/compute/requests/slicehost/slice_tests.rb
rename to tests/slicehost/requests/compute/slice_tests.rb
diff --git a/tests/dns/requests/slicehost/dns_tests.rb b/tests/slicehost/requests/dns/dns_tests.rb
similarity index 100%
rename from tests/dns/requests/slicehost/dns_tests.rb
rename to tests/slicehost/requests/dns/dns_tests.rb
diff --git a/tests/compute/requests/storm_on_demand/server_tests.rb b/tests/storm_on_demand/requests/compute/server_tests.rb
similarity index 100%
rename from tests/compute/requests/storm_on_demand/server_tests.rb
rename to tests/storm_on_demand/requests/compute/server_tests.rb
diff --git a/tests/compute/models/vcloud/helper.rb b/tests/vcloud/models/compute/helper.rb
similarity index 100%
rename from tests/compute/models/vcloud/helper.rb
rename to tests/vcloud/models/compute/helper.rb
diff --git a/tests/compute/models/vcloud/servers_tests.rb b/tests/vcloud/models/compute/servers_tests.rb
similarity index 100%
rename from tests/compute/models/vcloud/servers_tests.rb
rename to tests/vcloud/models/compute/servers_tests.rb
diff --git a/tests/compute/requests/vcloud/disk_configure_tests.rb b/tests/vcloud/requests/compute/disk_configure_tests.rb
similarity index 100%
rename from tests/compute/requests/vcloud/disk_configure_tests.rb
rename to tests/vcloud/requests/compute/disk_configure_tests.rb
diff --git a/tests/compute/requests/voxel/image_tests.rb b/tests/voxel/requests/compute/image_tests.rb
similarity index 100%
rename from tests/compute/requests/voxel/image_tests.rb
rename to tests/voxel/requests/compute/image_tests.rb
diff --git a/tests/compute/requests/voxel/server_tests.rb b/tests/voxel/requests/compute/server_tests.rb
similarity index 100%
rename from tests/compute/requests/voxel/server_tests.rb
rename to tests/voxel/requests/compute/server_tests.rb
diff --git a/tests/dns/requests/zerigo/dns_tests.rb b/tests/zerigo/requests/dns/dns_tests.rb
similarity index 100%
rename from tests/dns/requests/zerigo/dns_tests.rb
rename to tests/zerigo/requests/dns/dns_tests.rb