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