diff --git a/core/cloud/azure b/cloud/azure
similarity index 100%
rename from core/cloud/azure
rename to cloud/azure
diff --git a/core/cloud/cloudformation b/cloud/cloudformation
similarity index 100%
rename from core/cloud/cloudformation
rename to cloud/cloudformation
diff --git a/core/cloud/digital_ocean b/cloud/digital_ocean
similarity index 100%
rename from core/cloud/digital_ocean
rename to cloud/digital_ocean
diff --git a/core/cloud/digital_ocean_domain b/cloud/digital_ocean_domain
similarity index 100%
rename from core/cloud/digital_ocean_domain
rename to cloud/digital_ocean_domain
diff --git a/core/cloud/digital_ocean_sshkey b/cloud/digital_ocean_sshkey
similarity index 100%
rename from core/cloud/digital_ocean_sshkey
rename to cloud/digital_ocean_sshkey
diff --git a/core/cloud/docker b/cloud/docker
similarity index 100%
rename from core/cloud/docker
rename to cloud/docker
diff --git a/core/cloud/docker_image b/cloud/docker_image
similarity index 100%
rename from core/cloud/docker_image
rename to cloud/docker_image
diff --git a/core/cloud/ec2 b/cloud/ec2
similarity index 100%
rename from core/cloud/ec2
rename to cloud/ec2
diff --git a/core/cloud/ec2_ami b/cloud/ec2_ami
similarity index 100%
rename from core/cloud/ec2_ami
rename to cloud/ec2_ami
diff --git a/core/cloud/ec2_ami_search b/cloud/ec2_ami_search
similarity index 100%
rename from core/cloud/ec2_ami_search
rename to cloud/ec2_ami_search
diff --git a/core/cloud/ec2_asg b/cloud/ec2_asg
similarity index 100%
rename from core/cloud/ec2_asg
rename to cloud/ec2_asg
diff --git a/core/cloud/ec2_eip b/cloud/ec2_eip
similarity index 100%
rename from core/cloud/ec2_eip
rename to cloud/ec2_eip
diff --git a/core/cloud/ec2_elb b/cloud/ec2_elb
similarity index 100%
rename from core/cloud/ec2_elb
rename to cloud/ec2_elb
diff --git a/core/cloud/ec2_elb_lb b/cloud/ec2_elb_lb
similarity index 100%
rename from core/cloud/ec2_elb_lb
rename to cloud/ec2_elb_lb
diff --git a/core/cloud/ec2_facts b/cloud/ec2_facts
similarity index 100%
rename from core/cloud/ec2_facts
rename to cloud/ec2_facts
diff --git a/core/cloud/ec2_group b/cloud/ec2_group
similarity index 100%
rename from core/cloud/ec2_group
rename to cloud/ec2_group
diff --git a/core/cloud/ec2_key b/cloud/ec2_key
similarity index 100%
rename from core/cloud/ec2_key
rename to cloud/ec2_key
diff --git a/core/cloud/ec2_lc b/cloud/ec2_lc
similarity index 100%
rename from core/cloud/ec2_lc
rename to cloud/ec2_lc
diff --git a/core/cloud/ec2_metric_alarm b/cloud/ec2_metric_alarm
similarity index 100%
rename from core/cloud/ec2_metric_alarm
rename to cloud/ec2_metric_alarm
diff --git a/core/cloud/ec2_scaling_policy b/cloud/ec2_scaling_policy
similarity index 100%
rename from core/cloud/ec2_scaling_policy
rename to cloud/ec2_scaling_policy
diff --git a/core/cloud/ec2_snapshot b/cloud/ec2_snapshot
similarity index 100%
rename from core/cloud/ec2_snapshot
rename to cloud/ec2_snapshot
diff --git a/core/cloud/ec2_tag b/cloud/ec2_tag
similarity index 100%
rename from core/cloud/ec2_tag
rename to cloud/ec2_tag
diff --git a/core/cloud/ec2_vol b/cloud/ec2_vol
similarity index 100%
rename from core/cloud/ec2_vol
rename to cloud/ec2_vol
diff --git a/core/cloud/ec2_vpc b/cloud/ec2_vpc
similarity index 100%
rename from core/cloud/ec2_vpc
rename to cloud/ec2_vpc
diff --git a/core/cloud/elasticache b/cloud/elasticache
similarity index 100%
rename from core/cloud/elasticache
rename to cloud/elasticache
diff --git a/core/cloud/gc_storage b/cloud/gc_storage
similarity index 100%
rename from core/cloud/gc_storage
rename to cloud/gc_storage
diff --git a/core/cloud/gce b/cloud/gce
similarity index 100%
rename from core/cloud/gce
rename to cloud/gce
diff --git a/core/cloud/gce_lb b/cloud/gce_lb
similarity index 100%
rename from core/cloud/gce_lb
rename to cloud/gce_lb
diff --git a/core/cloud/gce_net b/cloud/gce_net
similarity index 100%
rename from core/cloud/gce_net
rename to cloud/gce_net
diff --git a/core/cloud/gce_pd b/cloud/gce_pd
similarity index 100%
rename from core/cloud/gce_pd
rename to cloud/gce_pd
diff --git a/core/cloud/glance_image b/cloud/glance_image
similarity index 100%
rename from core/cloud/glance_image
rename to cloud/glance_image
diff --git a/core/cloud/keystone_user b/cloud/keystone_user
similarity index 100%
rename from core/cloud/keystone_user
rename to cloud/keystone_user
diff --git a/core/cloud/linode b/cloud/linode
similarity index 100%
rename from core/cloud/linode
rename to cloud/linode
diff --git a/core/cloud/nova_compute b/cloud/nova_compute
similarity index 100%
rename from core/cloud/nova_compute
rename to cloud/nova_compute
diff --git a/core/cloud/nova_keypair b/cloud/nova_keypair
similarity index 100%
rename from core/cloud/nova_keypair
rename to cloud/nova_keypair
diff --git a/core/cloud/quantum_floating_ip b/cloud/quantum_floating_ip
similarity index 100%
rename from core/cloud/quantum_floating_ip
rename to cloud/quantum_floating_ip
diff --git a/core/cloud/quantum_floating_ip_associate b/cloud/quantum_floating_ip_associate
similarity index 100%
rename from core/cloud/quantum_floating_ip_associate
rename to cloud/quantum_floating_ip_associate
diff --git a/core/cloud/quantum_network b/cloud/quantum_network
similarity index 100%
rename from core/cloud/quantum_network
rename to cloud/quantum_network
diff --git a/core/cloud/quantum_router b/cloud/quantum_router
similarity index 100%
rename from core/cloud/quantum_router
rename to cloud/quantum_router
diff --git a/core/cloud/quantum_router_gateway b/cloud/quantum_router_gateway
similarity index 100%
rename from core/cloud/quantum_router_gateway
rename to cloud/quantum_router_gateway
diff --git a/core/cloud/quantum_router_interface b/cloud/quantum_router_interface
similarity index 100%
rename from core/cloud/quantum_router_interface
rename to cloud/quantum_router_interface
diff --git a/core/cloud/quantum_subnet b/cloud/quantum_subnet
similarity index 100%
rename from core/cloud/quantum_subnet
rename to cloud/quantum_subnet
diff --git a/core/cloud/rax b/cloud/rax
similarity index 100%
rename from core/cloud/rax
rename to cloud/rax
diff --git a/core/cloud/rax_cbs b/cloud/rax_cbs
similarity index 100%
rename from core/cloud/rax_cbs
rename to cloud/rax_cbs
diff --git a/core/cloud/rax_cbs_attachments b/cloud/rax_cbs_attachments
similarity index 100%
rename from core/cloud/rax_cbs_attachments
rename to cloud/rax_cbs_attachments
diff --git a/core/cloud/rax_cdb b/cloud/rax_cdb
similarity index 100%
rename from core/cloud/rax_cdb
rename to cloud/rax_cdb
diff --git a/core/cloud/rax_cdb_database b/cloud/rax_cdb_database
similarity index 100%
rename from core/cloud/rax_cdb_database
rename to cloud/rax_cdb_database
diff --git a/core/cloud/rax_cdb_user b/cloud/rax_cdb_user
similarity index 100%
rename from core/cloud/rax_cdb_user
rename to cloud/rax_cdb_user
diff --git a/core/cloud/rax_clb b/cloud/rax_clb
similarity index 100%
rename from core/cloud/rax_clb
rename to cloud/rax_clb
diff --git a/core/cloud/rax_clb_nodes b/cloud/rax_clb_nodes
similarity index 100%
rename from core/cloud/rax_clb_nodes
rename to cloud/rax_clb_nodes
diff --git a/core/cloud/rax_dns b/cloud/rax_dns
similarity index 100%
rename from core/cloud/rax_dns
rename to cloud/rax_dns
diff --git a/core/cloud/rax_dns_record b/cloud/rax_dns_record
similarity index 100%
rename from core/cloud/rax_dns_record
rename to cloud/rax_dns_record
diff --git a/core/cloud/rax_facts b/cloud/rax_facts
similarity index 100%
rename from core/cloud/rax_facts
rename to cloud/rax_facts
diff --git a/core/cloud/rax_files b/cloud/rax_files
similarity index 100%
rename from core/cloud/rax_files
rename to cloud/rax_files
diff --git a/core/cloud/rax_files_objects b/cloud/rax_files_objects
similarity index 100%
rename from core/cloud/rax_files_objects
rename to cloud/rax_files_objects
diff --git a/core/cloud/rax_identity b/cloud/rax_identity
similarity index 100%
rename from core/cloud/rax_identity
rename to cloud/rax_identity
diff --git a/core/cloud/rax_keypair b/cloud/rax_keypair
similarity index 100%
rename from core/cloud/rax_keypair
rename to cloud/rax_keypair
diff --git a/core/cloud/rax_meta b/cloud/rax_meta
similarity index 100%
rename from core/cloud/rax_meta
rename to cloud/rax_meta
diff --git a/core/cloud/rax_network b/cloud/rax_network
similarity index 100%
rename from core/cloud/rax_network
rename to cloud/rax_network
diff --git a/core/cloud/rax_queue b/cloud/rax_queue
similarity index 100%
rename from core/cloud/rax_queue
rename to cloud/rax_queue
diff --git a/core/cloud/rax_scaling_group b/cloud/rax_scaling_group
similarity index 100%
rename from core/cloud/rax_scaling_group
rename to cloud/rax_scaling_group
diff --git a/core/cloud/rax_scaling_policy b/cloud/rax_scaling_policy
similarity index 100%
rename from core/cloud/rax_scaling_policy
rename to cloud/rax_scaling_policy
diff --git a/core/cloud/rds b/cloud/rds
similarity index 100%
rename from core/cloud/rds
rename to cloud/rds
diff --git a/core/cloud/rds_param_group b/cloud/rds_param_group
similarity index 100%
rename from core/cloud/rds_param_group
rename to cloud/rds_param_group
diff --git a/core/cloud/rds_subnet_group b/cloud/rds_subnet_group
similarity index 100%
rename from core/cloud/rds_subnet_group
rename to cloud/rds_subnet_group
diff --git a/core/cloud/route53 b/cloud/route53
similarity index 100%
rename from core/cloud/route53
rename to cloud/route53
diff --git a/core/cloud/s3 b/cloud/s3
similarity index 100%
rename from core/cloud/s3
rename to cloud/s3
diff --git a/core/cloud/vsphere_guest b/cloud/vsphere_guest
similarity index 100%
rename from core/cloud/vsphere_guest
rename to cloud/vsphere_guest
diff --git a/core/commands/command b/commands/command
similarity index 100%
rename from core/commands/command
rename to commands/command
diff --git a/core/commands/raw b/commands/raw
similarity index 100%
rename from core/commands/raw
rename to commands/raw
diff --git a/core/commands/script b/commands/script
similarity index 100%
rename from core/commands/script
rename to commands/script
diff --git a/core/commands/shell b/commands/shell
similarity index 100%
rename from core/commands/shell
rename to commands/shell
diff --git a/core/database/mysql_db b/database/mysql_db
similarity index 100%
rename from core/database/mysql_db
rename to database/mysql_db
diff --git a/core/database/mysql_user b/database/mysql_user
similarity index 100%
rename from core/database/mysql_user
rename to database/mysql_user
diff --git a/core/database/mysql_variables b/database/mysql_variables
similarity index 100%
rename from core/database/mysql_variables
rename to database/mysql_variables
diff --git a/core/database/postgresql_db b/database/postgresql_db
similarity index 100%
rename from core/database/postgresql_db
rename to database/postgresql_db
diff --git a/core/database/postgresql_privs b/database/postgresql_privs
similarity index 100%
rename from core/database/postgresql_privs
rename to database/postgresql_privs
diff --git a/core/database/postgresql_user b/database/postgresql_user
similarity index 100%
rename from core/database/postgresql_user
rename to database/postgresql_user
diff --git a/core/files/acl b/files/acl
similarity index 100%
rename from core/files/acl
rename to files/acl
diff --git a/core/files/assemble b/files/assemble
similarity index 100%
rename from core/files/assemble
rename to files/assemble
diff --git a/core/files/copy b/files/copy
similarity index 100%
rename from core/files/copy
rename to files/copy
diff --git a/core/files/fetch b/files/fetch
similarity index 100%
rename from core/files/fetch
rename to files/fetch
diff --git a/core/files/file b/files/file
similarity index 100%
rename from core/files/file
rename to files/file
diff --git a/core/files/ini_file b/files/ini_file
similarity index 100%
rename from core/files/ini_file
rename to files/ini_file
diff --git a/core/files/lineinfile b/files/lineinfile
similarity index 100%
rename from core/files/lineinfile
rename to files/lineinfile
diff --git a/core/files/replace b/files/replace
similarity index 100%
rename from core/files/replace
rename to files/replace
diff --git a/core/files/stat b/files/stat
similarity index 100%
rename from core/files/stat
rename to files/stat
diff --git a/core/files/synchronize b/files/synchronize
similarity index 100%
rename from core/files/synchronize
rename to files/synchronize
diff --git a/core/files/template b/files/template
similarity index 100%
rename from core/files/template
rename to files/template
diff --git a/core/files/unarchive b/files/unarchive
similarity index 100%
rename from core/files/unarchive
rename to files/unarchive
diff --git a/core/files/xattr b/files/xattr
similarity index 100%
rename from core/files/xattr
rename to files/xattr
diff --git a/core/internal/async_status b/internal/async_status
similarity index 100%
rename from core/internal/async_status
rename to internal/async_status
diff --git a/core/internal/async_wrapper b/internal/async_wrapper
similarity index 100%
rename from core/internal/async_wrapper
rename to internal/async_wrapper
diff --git a/core/inventory/add_host b/inventory/add_host
similarity index 100%
rename from core/inventory/add_host
rename to inventory/add_host
diff --git a/core/inventory/group_by b/inventory/group_by
similarity index 100%
rename from core/inventory/group_by
rename to inventory/group_by
diff --git a/core/network/get_url b/network/get_url
similarity index 100%
rename from core/network/get_url
rename to network/get_url
diff --git a/core/network/slurp b/network/slurp
similarity index 100%
rename from core/network/slurp
rename to network/slurp
diff --git a/core/network/uri b/network/uri
similarity index 100%
rename from core/network/uri
rename to network/uri
diff --git a/core/packaging/apt b/packaging/apt
similarity index 100%
rename from core/packaging/apt
rename to packaging/apt
diff --git a/core/packaging/apt_key b/packaging/apt_key
similarity index 100%
rename from core/packaging/apt_key
rename to packaging/apt_key
diff --git a/core/packaging/apt_repository b/packaging/apt_repository
similarity index 100%
rename from core/packaging/apt_repository
rename to packaging/apt_repository
diff --git a/core/packaging/apt_rpm b/packaging/apt_rpm
similarity index 100%
rename from core/packaging/apt_rpm
rename to packaging/apt_rpm
diff --git a/core/packaging/easy_install b/packaging/easy_install
similarity index 100%
rename from core/packaging/easy_install
rename to packaging/easy_install
diff --git a/core/packaging/gem b/packaging/gem
similarity index 100%
rename from core/packaging/gem
rename to packaging/gem
diff --git a/core/packaging/pip b/packaging/pip
similarity index 100%
rename from core/packaging/pip
rename to packaging/pip
diff --git a/core/packaging/redhat_subscription b/packaging/redhat_subscription
similarity index 100%
rename from core/packaging/redhat_subscription
rename to packaging/redhat_subscription
diff --git a/core/packaging/rhn_channel b/packaging/rhn_channel
similarity index 100%
rename from core/packaging/rhn_channel
rename to packaging/rhn_channel
diff --git a/core/packaging/rhn_register b/packaging/rhn_register
similarity index 100%
rename from core/packaging/rhn_register
rename to packaging/rhn_register
diff --git a/core/packaging/rpm_key b/packaging/rpm_key
similarity index 100%
rename from core/packaging/rpm_key
rename to packaging/rpm_key
diff --git a/core/packaging/yum b/packaging/yum
similarity index 100%
rename from core/packaging/yum
rename to packaging/yum
diff --git a/core/source_control/git b/source_control/git
similarity index 100%
rename from core/source_control/git
rename to source_control/git
diff --git a/core/source_control/hg b/source_control/hg
similarity index 100%
rename from core/source_control/hg
rename to source_control/hg
diff --git a/core/source_control/subversion b/source_control/subversion
similarity index 100%
rename from core/source_control/subversion
rename to source_control/subversion
diff --git a/core/system/authorized_key b/system/authorized_key
similarity index 100%
rename from core/system/authorized_key
rename to system/authorized_key
diff --git a/core/system/cron b/system/cron
similarity index 100%
rename from core/system/cron
rename to system/cron
diff --git a/core/system/group b/system/group
similarity index 100%
rename from core/system/group
rename to system/group
diff --git a/core/system/hostname b/system/hostname
similarity index 100%
rename from core/system/hostname
rename to system/hostname
diff --git a/core/system/mount b/system/mount
similarity index 100%
rename from core/system/mount
rename to system/mount
diff --git a/core/system/ping b/system/ping
similarity index 100%
rename from core/system/ping
rename to system/ping
diff --git a/core/system/seboolean b/system/seboolean
similarity index 100%
rename from core/system/seboolean
rename to system/seboolean
diff --git a/core/system/selinux b/system/selinux
similarity index 100%
rename from core/system/selinux
rename to system/selinux
diff --git a/core/system/service b/system/service
similarity index 100%
rename from core/system/service
rename to system/service
diff --git a/core/system/setup b/system/setup
similarity index 100%
rename from core/system/setup
rename to system/setup
diff --git a/core/system/sysctl b/system/sysctl
similarity index 100%
rename from core/system/sysctl
rename to system/sysctl
diff --git a/core/system/user b/system/user
similarity index 100%
rename from core/system/user
rename to system/user
diff --git a/core/utilities/accelerate b/utilities/accelerate
similarity index 100%
rename from core/utilities/accelerate
rename to utilities/accelerate
diff --git a/core/utilities/assert b/utilities/assert
similarity index 100%
rename from core/utilities/assert
rename to utilities/assert
diff --git a/core/utilities/debug b/utilities/debug
similarity index 100%
rename from core/utilities/debug
rename to utilities/debug
diff --git a/core/utilities/fail b/utilities/fail
similarity index 100%
rename from core/utilities/fail
rename to utilities/fail
diff --git a/core/utilities/fireball b/utilities/fireball
similarity index 100%
rename from core/utilities/fireball
rename to utilities/fireball
diff --git a/core/utilities/include_vars b/utilities/include_vars
similarity index 100%
rename from core/utilities/include_vars
rename to utilities/include_vars
diff --git a/core/utilities/pause b/utilities/pause
similarity index 100%
rename from core/utilities/pause
rename to utilities/pause
diff --git a/core/utilities/set_fact b/utilities/set_fact
similarity index 100%
rename from core/utilities/set_fact
rename to utilities/set_fact
diff --git a/core/utilities/wait_for b/utilities/wait_for
similarity index 100%
rename from core/utilities/wait_for
rename to utilities/wait_for
diff --git a/core/web_infrastructure/apache2_module b/web_infrastructure/apache2_module
similarity index 100%
rename from core/web_infrastructure/apache2_module
rename to web_infrastructure/apache2_module
diff --git a/core/web_infrastructure/django_manage b/web_infrastructure/django_manage
similarity index 100%
rename from core/web_infrastructure/django_manage
rename to web_infrastructure/django_manage
diff --git a/core/web_infrastructure/htpasswd b/web_infrastructure/htpasswd
similarity index 100%
rename from core/web_infrastructure/htpasswd
rename to web_infrastructure/htpasswd
diff --git a/core/web_infrastructure/supervisorctl b/web_infrastructure/supervisorctl
similarity index 100%
rename from core/web_infrastructure/supervisorctl
rename to web_infrastructure/supervisorctl
diff --git a/core/windows/setup.ps1 b/windows/setup.ps1
similarity index 100%
rename from core/windows/setup.ps1
rename to windows/setup.ps1
diff --git a/core/windows/slurp.ps1 b/windows/slurp.ps1
similarity index 100%
rename from core/windows/slurp.ps1
rename to windows/slurp.ps1
diff --git a/core/windows/win_feature b/windows/win_feature
similarity index 100%
rename from core/windows/win_feature
rename to windows/win_feature
diff --git a/core/windows/win_feature.ps1 b/windows/win_feature.ps1
similarity index 100%
rename from core/windows/win_feature.ps1
rename to windows/win_feature.ps1
diff --git a/core/windows/win_get_url b/windows/win_get_url
similarity index 100%
rename from core/windows/win_get_url
rename to windows/win_get_url
diff --git a/core/windows/win_get_url.ps1 b/windows/win_get_url.ps1
similarity index 100%
rename from core/windows/win_get_url.ps1
rename to windows/win_get_url.ps1
diff --git a/core/windows/win_group b/windows/win_group
similarity index 100%
rename from core/windows/win_group
rename to windows/win_group
diff --git a/core/windows/win_group.ps1 b/windows/win_group.ps1
similarity index 100%
rename from core/windows/win_group.ps1
rename to windows/win_group.ps1
diff --git a/core/windows/win_msi b/windows/win_msi
similarity index 100%
rename from core/windows/win_msi
rename to windows/win_msi
diff --git a/core/windows/win_msi.ps1 b/windows/win_msi.ps1
similarity index 100%
rename from core/windows/win_msi.ps1
rename to windows/win_msi.ps1
diff --git a/core/windows/win_ping b/windows/win_ping
similarity index 100%
rename from core/windows/win_ping
rename to windows/win_ping
diff --git a/core/windows/win_ping.ps1 b/windows/win_ping.ps1
similarity index 100%
rename from core/windows/win_ping.ps1
rename to windows/win_ping.ps1
diff --git a/core/windows/win_service b/windows/win_service
similarity index 100%
rename from core/windows/win_service
rename to windows/win_service
diff --git a/core/windows/win_service.ps1 b/windows/win_service.ps1
similarity index 100%
rename from core/windows/win_service.ps1
rename to windows/win_service.ps1
diff --git a/core/windows/win_stat b/windows/win_stat
similarity index 100%
rename from core/windows/win_stat
rename to windows/win_stat
diff --git a/core/windows/win_stat.ps1 b/windows/win_stat.ps1
similarity index 100%
rename from core/windows/win_stat.ps1
rename to windows/win_stat.ps1
diff --git a/core/windows/win_user b/windows/win_user
similarity index 100%
rename from core/windows/win_user
rename to windows/win_user
diff --git a/core/windows/win_user.ps1 b/windows/win_user.ps1
similarity index 100%
rename from core/windows/win_user.ps1
rename to windows/win_user.ps1