diff --git a/cloud/cloudformation.py b/cloud/amazon/cloudformation.py
similarity index 100%
rename from cloud/cloudformation.py
rename to cloud/amazon/cloudformation.py
diff --git a/cloud/ec2.py b/cloud/amazon/ec2.py
similarity index 100%
rename from cloud/ec2.py
rename to cloud/amazon/ec2.py
diff --git a/cloud/ec2_ami.py b/cloud/amazon/ec2_ami.py
similarity index 100%
rename from cloud/ec2_ami.py
rename to cloud/amazon/ec2_ami.py
diff --git a/cloud/ec2_ami_search.py b/cloud/amazon/ec2_ami_search.py
similarity index 100%
rename from cloud/ec2_ami_search.py
rename to cloud/amazon/ec2_ami_search.py
diff --git a/cloud/ec2_asg.py b/cloud/amazon/ec2_asg.py
similarity index 100%
rename from cloud/ec2_asg.py
rename to cloud/amazon/ec2_asg.py
diff --git a/cloud/ec2_eip.py b/cloud/amazon/ec2_eip.py
similarity index 100%
rename from cloud/ec2_eip.py
rename to cloud/amazon/ec2_eip.py
diff --git a/cloud/ec2_elb.py b/cloud/amazon/ec2_elb.py
similarity index 100%
rename from cloud/ec2_elb.py
rename to cloud/amazon/ec2_elb.py
diff --git a/cloud/ec2_elb_lb.py b/cloud/amazon/ec2_elb_lb.py
similarity index 100%
rename from cloud/ec2_elb_lb.py
rename to cloud/amazon/ec2_elb_lb.py
diff --git a/cloud/ec2_facts.py b/cloud/amazon/ec2_facts.py
similarity index 100%
rename from cloud/ec2_facts.py
rename to cloud/amazon/ec2_facts.py
diff --git a/cloud/ec2_group.py b/cloud/amazon/ec2_group.py
similarity index 100%
rename from cloud/ec2_group.py
rename to cloud/amazon/ec2_group.py
diff --git a/cloud/ec2_key.py b/cloud/amazon/ec2_key.py
similarity index 100%
rename from cloud/ec2_key.py
rename to cloud/amazon/ec2_key.py
diff --git a/cloud/ec2_lc.py b/cloud/amazon/ec2_lc.py
similarity index 100%
rename from cloud/ec2_lc.py
rename to cloud/amazon/ec2_lc.py
diff --git a/cloud/ec2_metric_alarm.py b/cloud/amazon/ec2_metric_alarm.py
similarity index 100%
rename from cloud/ec2_metric_alarm.py
rename to cloud/amazon/ec2_metric_alarm.py
diff --git a/cloud/ec2_scaling_policy.py b/cloud/amazon/ec2_scaling_policy.py
similarity index 100%
rename from cloud/ec2_scaling_policy.py
rename to cloud/amazon/ec2_scaling_policy.py
diff --git a/cloud/ec2_snapshot.py b/cloud/amazon/ec2_snapshot.py
similarity index 100%
rename from cloud/ec2_snapshot.py
rename to cloud/amazon/ec2_snapshot.py
diff --git a/cloud/ec2_tag.py b/cloud/amazon/ec2_tag.py
similarity index 100%
rename from cloud/ec2_tag.py
rename to cloud/amazon/ec2_tag.py
diff --git a/cloud/ec2_vol.py b/cloud/amazon/ec2_vol.py
similarity index 100%
rename from cloud/ec2_vol.py
rename to cloud/amazon/ec2_vol.py
diff --git a/cloud/ec2_vpc.py b/cloud/amazon/ec2_vpc.py
similarity index 100%
rename from cloud/ec2_vpc.py
rename to cloud/amazon/ec2_vpc.py
diff --git a/cloud/elasticache.py b/cloud/amazon/elasticache.py
similarity index 100%
rename from cloud/elasticache.py
rename to cloud/amazon/elasticache.py
diff --git a/cloud/rds.py b/cloud/amazon/rds.py
similarity index 100%
rename from cloud/rds.py
rename to cloud/amazon/rds.py
diff --git a/cloud/rds_param_group.py b/cloud/amazon/rds_param_group.py
similarity index 100%
rename from cloud/rds_param_group.py
rename to cloud/amazon/rds_param_group.py
diff --git a/cloud/rds_subnet_group.py b/cloud/amazon/rds_subnet_group.py
similarity index 100%
rename from cloud/rds_subnet_group.py
rename to cloud/amazon/rds_subnet_group.py
diff --git a/cloud/route53.py b/cloud/amazon/route53.py
similarity index 100%
rename from cloud/route53.py
rename to cloud/amazon/route53.py
diff --git a/cloud/s3.py b/cloud/amazon/s3.py
similarity index 100%
rename from cloud/s3.py
rename to cloud/amazon/s3.py
diff --git a/cloud/azure.py b/cloud/azure/azure.py
similarity index 100%
rename from cloud/azure.py
rename to cloud/azure/azure.py
diff --git a/cloud/digital_ocean.py b/cloud/digital_ocean/digital_ocean.py
similarity index 100%
rename from cloud/digital_ocean.py
rename to cloud/digital_ocean/digital_ocean.py
diff --git a/cloud/digital_ocean_domain.py b/cloud/digital_ocean/digital_ocean_domain.py
similarity index 100%
rename from cloud/digital_ocean_domain.py
rename to cloud/digital_ocean/digital_ocean_domain.py
diff --git a/cloud/digital_ocean_sshkey.py b/cloud/digital_ocean/digital_ocean_sshkey.py
similarity index 100%
rename from cloud/digital_ocean_sshkey.py
rename to cloud/digital_ocean/digital_ocean_sshkey.py
diff --git a/cloud/docker.py b/cloud/docker/docker.py
similarity index 100%
rename from cloud/docker.py
rename to cloud/docker/docker.py
diff --git a/cloud/docker_image.py b/cloud/docker/docker_image.py
similarity index 100%
rename from cloud/docker_image.py
rename to cloud/docker/docker_image.py
diff --git a/cloud/gc_storage.py b/cloud/google/gc_storage.py
similarity index 100%
rename from cloud/gc_storage.py
rename to cloud/google/gc_storage.py
diff --git a/cloud/gce.py b/cloud/google/gce.py
similarity index 100%
rename from cloud/gce.py
rename to cloud/google/gce.py
diff --git a/cloud/gce_lb.py b/cloud/google/gce_lb.py
similarity index 100%
rename from cloud/gce_lb.py
rename to cloud/google/gce_lb.py
diff --git a/cloud/gce_net.py b/cloud/google/gce_net.py
similarity index 100%
rename from cloud/gce_net.py
rename to cloud/google/gce_net.py
diff --git a/cloud/gce_pd.py b/cloud/google/gce_pd.py
similarity index 100%
rename from cloud/gce_pd.py
rename to cloud/google/gce_pd.py
diff --git a/cloud/linode.py b/cloud/linode/linode.py
similarity index 100%
rename from cloud/linode.py
rename to cloud/linode/linode.py
diff --git a/cloud/glance_image.py b/cloud/openstack/glance_image.py
similarity index 100%
rename from cloud/glance_image.py
rename to cloud/openstack/glance_image.py
diff --git a/cloud/keystone_user.py b/cloud/openstack/keystone_user.py
similarity index 100%
rename from cloud/keystone_user.py
rename to cloud/openstack/keystone_user.py
diff --git a/cloud/nova_compute.py b/cloud/openstack/nova_compute.py
similarity index 100%
rename from cloud/nova_compute.py
rename to cloud/openstack/nova_compute.py
diff --git a/cloud/nova_keypair.py b/cloud/openstack/nova_keypair.py
similarity index 100%
rename from cloud/nova_keypair.py
rename to cloud/openstack/nova_keypair.py
diff --git a/cloud/quantum_floating_ip.py b/cloud/openstack/quantum_floating_ip.py
similarity index 100%
rename from cloud/quantum_floating_ip.py
rename to cloud/openstack/quantum_floating_ip.py
diff --git a/cloud/quantum_floating_ip_associate.py b/cloud/openstack/quantum_floating_ip_associate.py
similarity index 100%
rename from cloud/quantum_floating_ip_associate.py
rename to cloud/openstack/quantum_floating_ip_associate.py
diff --git a/cloud/quantum_network.py b/cloud/openstack/quantum_network.py
similarity index 100%
rename from cloud/quantum_network.py
rename to cloud/openstack/quantum_network.py
diff --git a/cloud/quantum_router.py b/cloud/openstack/quantum_router.py
similarity index 100%
rename from cloud/quantum_router.py
rename to cloud/openstack/quantum_router.py
diff --git a/cloud/quantum_router_gateway.py b/cloud/openstack/quantum_router_gateway.py
similarity index 100%
rename from cloud/quantum_router_gateway.py
rename to cloud/openstack/quantum_router_gateway.py
diff --git a/cloud/quantum_router_interface.py b/cloud/openstack/quantum_router_interface.py
similarity index 100%
rename from cloud/quantum_router_interface.py
rename to cloud/openstack/quantum_router_interface.py
diff --git a/cloud/quantum_subnet.py b/cloud/openstack/quantum_subnet.py
similarity index 100%
rename from cloud/quantum_subnet.py
rename to cloud/openstack/quantum_subnet.py
diff --git a/cloud/rax.py b/cloud/rackspace/rax.py
similarity index 100%
rename from cloud/rax.py
rename to cloud/rackspace/rax.py
diff --git a/cloud/rax_cbs.py b/cloud/rackspace/rax_cbs.py
similarity index 100%
rename from cloud/rax_cbs.py
rename to cloud/rackspace/rax_cbs.py
diff --git a/cloud/rax_cbs_attachments.py b/cloud/rackspace/rax_cbs_attachments.py
similarity index 100%
rename from cloud/rax_cbs_attachments.py
rename to cloud/rackspace/rax_cbs_attachments.py
diff --git a/cloud/rax_cdb.py b/cloud/rackspace/rax_cdb.py
similarity index 100%
rename from cloud/rax_cdb.py
rename to cloud/rackspace/rax_cdb.py
diff --git a/cloud/rax_cdb_database.py b/cloud/rackspace/rax_cdb_database.py
similarity index 100%
rename from cloud/rax_cdb_database.py
rename to cloud/rackspace/rax_cdb_database.py
diff --git a/cloud/rax_cdb_user.py b/cloud/rackspace/rax_cdb_user.py
similarity index 100%
rename from cloud/rax_cdb_user.py
rename to cloud/rackspace/rax_cdb_user.py
diff --git a/cloud/rax_clb.py b/cloud/rackspace/rax_clb.py
similarity index 100%
rename from cloud/rax_clb.py
rename to cloud/rackspace/rax_clb.py
diff --git a/cloud/rax_clb_nodes.py b/cloud/rackspace/rax_clb_nodes.py
similarity index 100%
rename from cloud/rax_clb_nodes.py
rename to cloud/rackspace/rax_clb_nodes.py
diff --git a/cloud/rax_dns.py b/cloud/rackspace/rax_dns.py
similarity index 100%
rename from cloud/rax_dns.py
rename to cloud/rackspace/rax_dns.py
diff --git a/cloud/rax_dns_record.py b/cloud/rackspace/rax_dns_record.py
similarity index 100%
rename from cloud/rax_dns_record.py
rename to cloud/rackspace/rax_dns_record.py
diff --git a/cloud/rax_facts.py b/cloud/rackspace/rax_facts.py
similarity index 100%
rename from cloud/rax_facts.py
rename to cloud/rackspace/rax_facts.py
diff --git a/cloud/rax_files.py b/cloud/rackspace/rax_files.py
similarity index 100%
rename from cloud/rax_files.py
rename to cloud/rackspace/rax_files.py
diff --git a/cloud/rax_files_objects.py b/cloud/rackspace/rax_files_objects.py
similarity index 100%
rename from cloud/rax_files_objects.py
rename to cloud/rackspace/rax_files_objects.py
diff --git a/cloud/rax_identity.py b/cloud/rackspace/rax_identity.py
similarity index 100%
rename from cloud/rax_identity.py
rename to cloud/rackspace/rax_identity.py
diff --git a/cloud/rax_keypair.py b/cloud/rackspace/rax_keypair.py
similarity index 100%
rename from cloud/rax_keypair.py
rename to cloud/rackspace/rax_keypair.py
diff --git a/cloud/rax_meta.py b/cloud/rackspace/rax_meta.py
similarity index 100%
rename from cloud/rax_meta.py
rename to cloud/rackspace/rax_meta.py
diff --git a/cloud/rax_network.py b/cloud/rackspace/rax_network.py
similarity index 100%
rename from cloud/rax_network.py
rename to cloud/rackspace/rax_network.py
diff --git a/cloud/rax_queue.py b/cloud/rackspace/rax_queue.py
similarity index 100%
rename from cloud/rax_queue.py
rename to cloud/rackspace/rax_queue.py
diff --git a/cloud/rax_scaling_group.py b/cloud/rackspace/rax_scaling_group.py
similarity index 100%
rename from cloud/rax_scaling_group.py
rename to cloud/rackspace/rax_scaling_group.py
diff --git a/cloud/rax_scaling_policy.py b/cloud/rackspace/rax_scaling_policy.py
similarity index 100%
rename from cloud/rax_scaling_policy.py
rename to cloud/rackspace/rax_scaling_policy.py
diff --git a/cloud/vsphere_guest.py b/cloud/vmware/vsphere_guest.py
similarity index 100%
rename from cloud/vsphere_guest.py
rename to cloud/vmware/vsphere_guest.py